[Helpers] Added test cases for I.waitForDetached and changed error messages so they are they same across all helpers

reubenmiller · reubenmiller · commit f2960d98b9c6 · 2018-02-28T19:10:13.000+01:00
diff --git a/docs/webapi/dontSeeElement.mustache b/docs/webapi/dontSeeElement.mustache
@@ -1,3 +1,3 @@
-Opposite to `seeElement`. Checks that element is not visible
+Opposite to `seeElement`. Checks that element is not visible (or in DOM)
 
 @param locator located by CSS|XPath|Strict locator
diff --git a/lib/helper/Nightmare.js b/lib/helper/Nightmare.js
@@ -907,7 +907,7 @@ class Nightmare extends Helper {
 
     return this.browser.wait((by, locator) => window.codeceptjs.findElement(by, locator) === null, locator.type, locator.value).catch((err) => {
       if (err.message && err.message.indexOf('.wait() timed out after') > -1) {
-        throw new Error(`element (${JSON.stringify(locator)}) still present on page after ${sec} sec`);
+        throw new Error(`element (${JSON.stringify(locator)}) still on page after ${sec} sec`);
       } else throw err;
     });
   }
diff --git a/lib/helper/Protractor.js b/lib/helper/Protractor.js
@@ -919,7 +919,11 @@ class Protractor extends Helper {
   async waitForDetached(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
     const el = global.element(guessLocator(locator) || global.by.css(locator));
-    return this.browser.wait(EC.not(EC.presenceOf(el)), aSec * 1000);
+    return this.browser.wait(EC.not(EC.presenceOf(el)), aSec * 1000).catch((err) => {
+      if (err.message && err.message.indexOf('Wait timed out after') > -1) {
+        throw new Error(`element (${JSON.stringify(locator)}) still on page after ${sec} sec`);
+      } else throw err;
+    });
   }
 
   /**
diff --git a/test/data/app/view/form/wait_detached.php b/test/data/app/view/form/wait_detached.php
@@ -0,0 +1,22 @@
+<html>
+<head>
+    <style>
+        .invisible_button { display: none; }
+    </style>
+</head>
+
+<body>
+
+<div id="step_1">Step One Button</div>
+<div id="step_2">Step Two Button</div>
+<script>
+  setTimeout(function () {
+    document.getElementById('step_1').style.display = 'none'; // Hide button
+    var step2 = document.getElementById('step_2'); // Remove button
+    step2.parentElement.removeChild(step2);
+  }, 1000);
+
+</script>
+
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		-Opposite to `seeElement`. Checks that element is not visible
	`1`	+Opposite to `seeElement`. Checks that element is not visible (or in DOM)
`2`	`2`
`3`	`3`	`@param locator located by CSS\|XPath\|Strict locator`
Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,7 @@ class Nightmare extends Helper {`
`907`	`907`
`908`	`908`	`return this.browser.wait((by, locator) => window.codeceptjs.findElement(by, locator) === null, locator.type, locator.value).catch((err) => {`
`909`	`909`	`if (err.message && err.message.indexOf('.wait() timed out after') > -1) {`
`910`		- throw new Error(`element (${JSON.stringify(locator)}) still present on page after ${sec} sec`);
	`910`	+ throw new Error(`element (${JSON.stringify(locator)}) still on page after ${sec} sec`);
`911`	`911`	`} else throw err;`
`912`	`912`	`});`
`913`	`913`	`}`