Merge branch 'master' of github.com:Codeception/CodeceptJS

DavertMik · DavertMik · commit 11df3e1248bf · 2018-06-26T01:40:13.000+03:00
diff --git a/lib/helper/Protractor.js b/lib/helper/Protractor.js
@@ -1076,7 +1076,7 @@ class Protractor extends Helper {
         return dialog.getText();
       }
     } catch (e) {
-      if (e.message.indexOf('no alert open') > -1) {
+      if (~e.message.indexOf('no alert open') || ~e.message.indexOf('no such alert')) {
         // Don't throw an error
         return null;
       }

Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ class Protractor extends Helper {`
`1076`	`1076`	`return dialog.getText();`
`1077`	`1077`	`}`
`1078`	`1078`	`} catch (e) {`
`1079`		`- if (e.message.indexOf('no alert open') > -1) {`
	`1079`	`+ if (~e.message.indexOf('no alert open') \|\| ~e.message.indexOf('no such alert')) {`
`1080`	`1080`	`// Don't throw an error`
`1081`	`1081`	`return null;`
`1082`	`1082`	`}`