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

Author: DavertMik

.travis.yml

@@ -21,9 +21,10 @@ addons:
 services:
 - docker
 before_install:
-- docker pull selenium/standalone-chrome:3.8
+- docker pull selenium/standalone-chrome:3.9.1-actinium
 before_script:
-- docker run -d --net=host selenium/standalone-chrome:3.8
+- docker run -d --net=host --shm-size=2g selenium/standalone-chrome:3.8
+- export DBUS_SESSION_BUS_ADDRESS=/dev/null
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 - chmod -R 777 test/data
@@ -32,5 +33,4 @@ before_script:
 - sleep 10
 script:
 - npm build && npm test
-- './node_modules/.bin/mocha test/rest'
 - './node_modules/.bin/mocha test/helper/${HELPER}_test.js'

docs/acceptance.md

@@ -46,8 +46,6 @@ Strict locators allow to specify additional locator types:
 ```js
 // locate form element by name
 I.seeElement({name: 'password'});
-// locate element by text
-I.seeElement({text: 'press me'});
 // locate element by id
 I.seeElement({id: 'users'});
 ```

docs/basics.md

@@ -116,7 +116,7 @@ Usage: `within('section', ()=>{})`
 
 ```js
 I.amOnPage('https://github.com');
-within('.form-signup-home', () => {
+within('.js-signup-form', () => {
   I.fillField('user[login]', 'User');
   I.fillField('user[email]', '[email protected]');
   I.fillField('user[password]', '[email protected]');

docs/nightmare.md

@@ -144,7 +144,7 @@ When opening a web page you can set headers as well. `amOnPage` methods can take
 
 ```js
 // use basic http auth
-I.amOnPage('/admin', [{'Authorization': 'Basic '+token}]);
+I.amOnPage('/admin', { 'Authorization': 'Basic '+token });
 ```
 
 As a small bonus: all `console.log` calls on a page will be also shown in `--debug` mode.

docs/webapi/grabSource.mustache

@@ -0,0 +1,6 @@
+Retrieves page source and returns it to test.
+Resumes test execution, so should be used inside an async function.
+
+```js
+let pageSource = await I.grabSource();
+```

docs/webapi/pressKey.mustache

@@ -1,5 +1,5 @@
 Presses a key on a focused element.
-Speical keys like 'Enter', 'Control', [etc](https://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/value)
+Special keys like 'Enter', 'Control', [etc](https://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/value)
 will be replaced with corresponding unicode.
 If modifier key is used (Control, Command, Alt, Shift) in array, it will be released afterwards.
 

docs/webapi/waitForStalenessOf.mustache renamed to docs/webapi/waitForDetached.mustache

@@ -2,7 +2,7 @@ Waits for an element to become not attached to the DOM on a page (by default wai
 Element can be located by CSS or XPath.
 
 ```
-I.waitForStalenessOf('#popup');
+I.waitForDetached('#popup');
 ```
 
 @param locator element located by CSS|XPath|strict locator

lib/helper/Nightmare.js

@@ -231,6 +231,7 @@ class Nightmare extends Helper {
       this.browser = this.Nightmare(this.options);
       await this.browser;
     }
+    await this.browser.goto('about:blank'); // Load a blank page so .saveScreenshot (/evaluate) will work
     this.isRunning = true;
     this.browser.on('dom-ready', () => this._injectClientScripts());
     this.browser.on('did-start-loading', () => this._injectClientScripts());
@@ -340,7 +341,7 @@ class Nightmare extends Helper {
    * In a second argument a list of request headers can be passed:
    *
    * ```js
-   * I.amOnPage('/auth', [{'x-my-custom-header': 'some value'}])
+   * I.amOnPage('/auth', { 'x-my-custom-header': 'some value' })
    * ```
    */
   async amOnPage(url, headers = null) {

lib/helper/Protractor.js

@@ -626,7 +626,7 @@ class Protractor extends Helper {
   }
 
   /**
-   * {{> ../webapi/seeInSource }}
+   * {{> ../webapi/grabSource }}
    */
   async grabSource() {
     return this.browser.getPageSource();
@@ -899,19 +899,30 @@ class Protractor extends Helper {
     return this.browser.wait(EC.presenceOf(el), aSec * 1000);
   }
 
+  async waitUntilExists(locator, sec = null) {
+    console.log(`waitUntilExists deprecated:
+    * use 'waitForElement' to wait for element to be attached
+    * use 'waitForDetached to wait for element to be removed'`);
+    return this.waitForDetached(locator, sec);
+  }
+
   /**
-   * {{> ../webapi/waitUntilExists }}
+   * {{> ../webapi/waitForDetached }}
    */
-  waitUntilExists(locator, sec = null) {
+  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);
   }
 
   /**
    * Waits for element to become clickable for number of seconds.
+   *
+   * ```js
+   * I.waitForClickable('#link');
+   * ```
    */
-  waitForClickable(locator, sec = null) {
+  async waitForClickable(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
     const el = global.element(guessLocator(locator) || global.by.css(locator));
     return this.browser.wait(EC.elementToBeClickable(el), aSec * 1000);
@@ -920,7 +931,7 @@ class Protractor extends Helper {
   /**
    * {{> ../webapi/waitForVisible }}
    */
-  waitForVisible(locator, sec = null) {
+  async waitForVisible(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
     const el = global.element(guessLocator(locator) || global.by.css(locator));
     return this.browser.wait(EC.visibilityOf(el), aSec * 1000);
@@ -929,23 +940,23 @@ class Protractor extends Helper {
   /**
    * {{> ../webapi/waitForInvisible }}
    */
-  waitForInvisible(locator, sec = null) {
+  async waitForInvisible(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
     const el = global.element(guessLocator(locator) || global.by.css(locator));
     return this.browser.wait(EC.invisibilityOf(el), aSec * 1000);
   }
 
-  /**
-   * {{> ../webapi/waitForStalenessOf }}
-   */
-  waitForStalenessOf(locator, sec = null) {
+  async waitForStalenessOf(locator, sec = null) {
+    console.log(`waitForStalenessOf deprecated.
+    * Use waitForDetached to wait for element to be removed from page
+    * Use waitForInvisible to wait for element to be hidden on page`);
     return this.waitForInvisible(locator, sec);
   }
 
   /**
    * {{> ../webapi/waitForText }}
    */
-  waitForText(text, sec = null, context = null) {
+  async waitForText(text, sec = null, context = null) {
     if (!context) {
       context = this.context;
     }

lib/helper/Puppeteer.js

@@ -912,7 +912,7 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * {{> ../webapi/seeInSource }}
+   * {{> ../webapi/grabSource }}
    */
   async grabSource() {
     return this.page.content();