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

Author: DavertMik

CHANGELOG.md

@@ -1,3 +1,25 @@
+## 1.3.0
+
+* Cucumber-style BDD Introduced. [Gherkin support](https://codecept.io/bdd).
+* Nested steps output enabled for page objects.
+* [Puppeteer] [Multiple sessions]((https://codecept.io/acceptance/#multiple-sessions) enabled. Requires Puppeteer >= 1.5
+* [Puppeteer] Stability improvement. Waits for for `load` event on page load. This strategy can be changed in config:
+  * `waitForNavigation` config option introduced. Possible options: `load`, `domcontentloaded`, `networkidle0`, `networkidle2`. See [Puppeteer API](https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#pagewaitfornavigationoptions)
+  * `getPageTimeout` config option to set maximum navigation time in milliseconds. Default is 30 seconds.
+  * `waitForNavigation` method added. Explicitly waits for navigation to be finished.
+* [Puppeteer] Fixed `resizeWindow` by @sergejkaravajnij
+* [WebDriverIO][Protractor][Puppeteer][Nightmare] `grabTextFrom` unified. Return a text for single matched element and an array of texts for multiple elements.
+* [WebDriverIO][Protractor][Puppeteer][Nightmare] `waitForFunction` added. Waits for client-side JavaScript function to return true by @GREENpoint.
+* [Puppeteer] `waitUntil` deprecated in favor of `waitForFunction`.
+* Added `filter` function to DataTable.
+* Send non-nested array of files to custom parallel execution chunking by @mikecbrant.
+* Fixed invalid output directory path for run-multiple by @mikecbrant.
+* [WebDriverIO] `waitUntil` timeout accepts time in seconds (as all other wait* functions). Fix by @truesrc.
+* [Nightmare] Fixed grabNumberOfVisibleElements to work similarly to `seeElement`. Thx to @stefanschenk and Jinbo Jinboson.
+* [Protractor] Fixed alert handling error with message 'no such alert' by @truesrc.
+
+
+
 ## 1.2.1
 
 * Fixed running `I.retry()` on multiple steps.

docs/acceptance.md

@@ -265,8 +265,6 @@ within({frame: [".content", "#editor"]}, () => {
 
 ## Multiple Sessions
 
-*Note: Currently multiple sessions work only in WebDriverIO and Protractor*
-
 CodeceptJS allows to run several browser sessions inside a test. This can be useful for testing communication between users inside a system, for instance in chats. To open another browser use `session()` function as shown in example:
 
 ```js

docs/puppeteer.md

@@ -56,7 +56,21 @@ Make sure `Puppeteer` helper is enabled in `codecept.json` config:
 
 Turn on the `show` option if you want to follow test progress in a window. This is very useful for debugging.
 
-Sometimes test may run faster than application gets rendered. In this case it is **recommended to increase `waitForAction` config value**. It will wait for a small amount of time (100ms) by default after each user action taken.
+Puppeteer uses different strategies to detect if a page is loaded. In configuration use `waitForNavigation` option for that:
+
+By default it is set to `domcontentloaded` which waits for `DOMContentLoaded` event being fired. However, for Single Page Applications it's more useful to set this value to `networkidle0` which waits for all network connections to be finished.
+
+```js
+  "helpers": {
+    "Puppeteer": {
+      "url": "http://localhost",
+      "waitForNavigation": "networkidle0"
+    }
+  }
+```
+
+WHen a test runs faster than application it is recommended to increase `waitForAction` config value.
+It will wait for a small amount of time (100ms) by default after each user action is taken.
 
 *More options are listed in [helper reference](http://codecept.io/helpers/Puppeteer/).*
 

docs/webapi/grabTextFrom.mustache

@@ -4,4 +4,6 @@ Resumes test execution, so **should be used inside async with `await`** operator
 ```js
 let pin = await I.grabTextFrom('#pin');
 ```
+If multiple elements found returns an array of texts.
+
 @param locator element located by CSS|XPath|strict locator

docs/webapi/waitForFunction.mustache

@@ -0,0 +1,10 @@
+Waits for a function to return true (waits for 1 sec by default).
+Running in browser context.
+
+```js
+I.waitForFunction(() => window.requests == 0);
+I.waitForFunction(() => window.requests == 0, 5); // waits for 5 sec
+```
+
+@param function to be executed in browser context
+@param sec time seconds to wait, 1 by default

lib/helper/Nightmare.js

@@ -764,9 +764,15 @@ class Nightmare extends Helper {
    */
   async grabTextFrom(locator) {
     locator = new Locator(locator, 'css');
-    const el = await this.browser.findElement(locator.toStrict());
-    assertElementExists(el, locator);
-    return this.browser.evaluate(el => window.codeceptjs.fetchElement(el).innerText, el);
+    const els = await this.browser.findElements(locator.toStrict());
+    assertElementExists(els[0], locator);
+    const texts = [];
+    const getText = el => window.codeceptjs.fetchElement(el).innerText;
+    for (const el of els) {
+      texts.push(await this.browser.evaluate(getText, el));
+    }
+    if (texts.length === 1) return texts[0];
+    return texts;
   }
 
   /**

lib/helper/Protractor.js

@@ -140,6 +140,7 @@ class Protractor extends Helper {
       driver: 'hosted',
       capabilities: {},
       angular: true,
+      restart: true,
     };
 
     config = Object.assign(defaults, config);
@@ -148,6 +149,7 @@ class Protractor extends Helper {
     if (!config.scriptTimeout) config.scriptTimeout = config.scriptsTimeout;
     if (config.proxy) config.capabilities.proxy = config.proxy;
     if (config.browser) config.capabilities.browserName = config.browser;
+
     config.waitForTimeout /= 1000; // convert to seconds
     return config;
   }
@@ -206,7 +208,6 @@ class Protractor extends Helper {
       this.browser = runner.createBrowser();
       await this.browser.ready;
     } catch (err) {
-      console.log(err);
       if (err.toString().indexOf('ECONNREFUSED')) {
         throw new ConnectionRefused(err);
       }
@@ -218,20 +219,16 @@ class Protractor extends Helper {
       await this.amOutsideAngularApp();
     }
 
-    try {
-      loadGlobals(this.browser);
+    loadGlobals(this.browser);
 
-      if (this.options.windowSize === 'maximize') {
-        await this.resizeWindow(this.options.windowSize);
-      } else if (this.options.windowSize) {
-        const size = this.options.windowSize.split('x');
-        await this.resizeWindow(parseInt(size[0], 10), parseInt(size[1], 10));
-      }
-      this.context = this.options.rootElement;
-      this.isRunning = true;
-    } catch (err) {
-      console.log(err);
+    if (this.options.windowSize === 'maximize') {
+      await this.resizeWindow(this.options.windowSize);
+    } else if (this.options.windowSize) {
+      const size = this.options.windowSize.split('x');
+      await this.resizeWindow(parseInt(size[0], 10), parseInt(size[1], 10));
     }
+    this.context = this.options.rootElement;
+    this.isRunning = true;
     return this.browser.ready;
   }
 
@@ -692,17 +689,20 @@ class Protractor extends Helper {
   async grabTextFrom(locator) {
     const els = await this._locate(locator);
     assertElementExists(els);
-    return els[0].getText();
+    const texts = [];
+    for (const el of els) {
+      texts.push(await el.getText());
+    }
+    if (texts.length === 1) return texts[0];
+    return texts;
   }
 
   /**
    * {{> ../webapi/grabHTMLFrom }}
    */
   async grabHTMLFrom(locator) {
     const els = await this._locate(locator);
-    if (!els) {
-      return null;
-    }
+    assertElementExists(els);
 
     const html = await Promise.all(els.map((el) => {
       return this.browser.executeScript('return arguments[0].innerHTML;', el);
@@ -1076,7 +1076,7 @@ class Protractor extends Helper {
         return dialog.getText();
       }
     } catch (e) {
-      if (~e.message.indexOf('no alert open') || ~e.message.indexOf('no such alert')) {
+      if (e.message.indexOf('no alert open') || e.message.indexOf('no such alert')) {
         // Don't throw an error
         return null;
       }
@@ -1226,7 +1226,6 @@ class Protractor extends Helper {
    * {{> ../webapi/switchTo }}
    */
   async switchTo(locator) {
-    // console.log('EC', EC);
     if (Number.isInteger(locator)) {
       return this.browser.switchTo().frame(locator);
     } else if (!locator) {