[WIP] Refactoring #800

DavertMik · 2017-12-02T08:57:56Z

Update to NodeJS v8
Refactor helpers to use async/await
Merge Protractor & SeleniumWebDriver helpers

houndci-bot · 2017-12-04T23:45:11Z

test/helper/webapi.js

-      yield I.seeCurrentUrlEquals(`${site_url}/info`);
-      return I.dontSeeCurrentUrlEquals(`${site_url}/form`);
+      yield I.seeCurrentUrlEquals(`${siteUrl}/info`);
+      return I.dontSeeCurrentUrlEquals(`${siteUrl}/form`);


'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-04T23:45:11Z

test/helper/webapi.js

      yield I.amOnPage('/info');
-      yield I.seeCurrentUrlEquals(`${site_url}/info`);
-      return I.dontSeeCurrentUrlEquals(`${site_url}/form`);
+      yield I.seeCurrentUrlEquals(`${siteUrl}/info`);


'yield' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).
'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-04T23:45:11Z

test/helper/webapi.js

 let I;
 let data;
-let site_url;
+let siteUrl;


'let' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-04T23:45:11Z

test/helper/WebDriverIO_test.js

+    it('should open any page of configured site', () => wd.amOnPage('/info').getUrl().then(url => url.should.eql(`${siteUrl}/info`)));

-    it('should open absolute url', () => wd.amOnPage(site_url).getUrl().then(url => url.should.eql(`${site_url}/`)));
+    it('should open absolute url', () => wd.amOnPage(siteUrl).getUrl().then(url => url.should.eql(`${siteUrl}/`)));


'arrow function syntax (=>)' is only available in ES6 (use 'esversion: 6').
'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-04T23:45:11Z

test/helper/WebDriverIO_test.js

+    it('should open main page of configured site', () => wd.amOnPage('/').getUrl().then(url => url.should.eql(`${siteUrl}/`)));

-    it('should open any page of configured site', () => wd.amOnPage('/info').getUrl().then(url => url.should.eql(`${site_url}/info`)));
+    it('should open any page of configured site', () => wd.amOnPage('/info').getUrl().then(url => url.should.eql(`${siteUrl}/info`)));


'arrow function syntax (=>)' is only available in ES6 (use 'esversion: 6').
'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-04T23:45:11Z

test/helper/WebDriverIO_test.js


 let wd;
-const site_url = TestHelper.siteUrl();
+const siteUrl = TestHelper.siteUrl();


'const' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-04T23:45:12Z

test/helper/Protractor_test.js

+const TestHelper = require('../support/TestHelper');

-const site_url = 'http://davertmik.github.io/angular-demo-app';
+const siteUrl = 'http://davertmik.github.io/angular-demo-app';


'const' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-04T23:45:12Z

test/helper/Protractor_test.js

-const TestHelper = require('../support/TestHelper');
-
 const Protractor = require('../../lib/helper/Protractor');
+const TestHelper = require('../support/TestHelper');


'const' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-04T23:45:12Z

test/helper/ProtractorWeb_test.js

-      return url.should.eql(`${site_url}/`);
+      yield I.amOnPage(siteUrl);
+      let url = yield browser.getCurrentUrl();
+      return url.should.eql(`${siteUrl}/`);


'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-04T23:45:12Z

test/helper/ProtractorWeb_test.js

-      const url = yield browser.getCurrentUrl();
-      return url.should.eql(`${site_url}/`);
+      yield I.amOnPage(siteUrl);
+      let url = yield browser.getCurrentUrl();


'let' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).
'yield' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:00:53Z

lib/helper/errors/ElementNotFound.js

Class properties must be methods. Expected '(' but instead saw 'new'.
'template literal syntax' is only available in ES6 (use 'esversion: 6').
Expected an identifier and instead saw '${'.
'function closure expressions' is only available in Mozilla JavaScript extensions (use moz option).
Expected an identifier and instead saw ')'.
Expected an operator and instead saw '.'.
Expected an identifier and instead saw '{a}'.
Class properties must be methods. Expected '(' but instead saw '}'.

houndci-bot · 2017-12-05T00:00:53Z

lib/helper/errors/ElementNotFound.js

'const' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:00:53Z

lib/interfaces/bdd.js

'let' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:00:53Z

lib/interfaces/bdd.js

'let' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:00:54Z

lib/interfaces/bdd.js

'let' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:00:54Z

lib/helper/SeleniumWebdriver.js

'const' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:00:54Z

lib/locator.js

'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-05T00:00:54Z

lib/locator.js

'let' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).
'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-05T00:00:54Z

lib/locator.js

'arrow function syntax (=>)' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-05T00:00:54Z

lib/locator.js

'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-05T00:31:37Z

lib/utils.js

  submittedData(dataFile) {
    return function (key) {
+      if (!fs.existsSync(dataFile)) {
+        const waitTill = new Date(new Date().getTime() + 1 * 1000); // wait for one sec for file to be created


'const' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:31:37Z

test/helper/ProtractorWeb_test.js

+      yield I.amOnPage(siteUrl);
      const url = yield browser.getCurrentUrl();
-      return url.should.eql(`${site_url}/`);
+      return url.should.eql(`${siteUrl}/`);


'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-05T00:31:37Z

test/helper/ProtractorWeb_test.js


    it('should open absolute url', function* () {
-      I.amOnPage(site_url);
+      yield I.amOnPage(siteUrl);


'yield' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:31:37Z

test/helper/ProtractorWeb_test.js

+      yield I.amOnPage('/info');
      const url = yield browser.getCurrentUrl();
-      return url.should.eql(`${site_url}/info`);
+      return url.should.eql(`${siteUrl}/info`);


'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-05T00:31:37Z

test/helper/ProtractorWeb_test.js


    it('should open any page of configured site', function* () {
-      I.amOnPage('/info');
+      yield I.amOnPage('/info');


'yield' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:31:37Z

test/helper/ProtractorWeb_test.js

+      yield I.amOnPage('/');
      const url = yield browser.getCurrentUrl();
-      return url.should.eql(`${site_url}/`);
+      return url.should.eql(`${siteUrl}/`);


'template literal syntax' is only available in ES6 (use 'esversion: 6').

houndci-bot · 2017-12-05T00:31:37Z

test/helper/ProtractorWeb_test.js

  describe('open page : #amOnPage', () => {
    it('should open main page of configured site', function* () {
-      I.amOnPage('/');
+      yield I.amOnPage('/');


'yield' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

houndci-bot · 2017-12-05T00:39:29Z

test/helper/Protractor_test.js

-      if (I.isProtractor5) return;
      return I.waitForText('Boom!', 0.5)
-        .thenCatch((e) => {
+        .then(() => { throw new Error('😟') })


Missing semicolon semi

houndci-bot · 2017-12-05T00:39:29Z

test/helper/Protractor_test.js

-      if (I.isProtractor5) return;
      return I.waitForText('Nothing here', 0, '#hello')
-        .thenCatch((e) => {
+        .then(() => { throw new Error('😟') })


Missing semicolon semi

houndci-bot · 2017-12-05T00:39:29Z

test/helper/Protractor_test.js

+      url: siteUrl,
      browser: 'chrome',
      seleniumAddress: TestHelper.seleniumAddress(),
+      angular: true


Missing trailing comma comma-dangle

houndci-bot · 2017-12-05T02:11:26Z

lib/locator.js

+
+function isXPath(locator) {
+  return locator.substr(0, 2) === '//' || locator.substr(0, 3) === './/';
+}


Newline required at end of file but not found eol-last

houndci-bot · 2017-12-05T02:11:26Z

lib/locator.js

+
+function isXPath(locator) {
+  return locator.substr(0, 2) === '//' || locator.substr(0, 3) === './/';
+}


Newline required at end of file but not found eol-last

houndci-bot · 2017-12-05T17:13:24Z

test/helper/Protractor_test.js

-
-const site_url = 'http://davertmik.github.io/angular-demo-app';
-const web_app_url = TestHelper.siteUrl();
+const TestHelper = require('../support/TestHelper');


Unable to resolve path to module '../support/TestHelper' import/no-unresolved

houndci-bot · 2017-12-05T17:13:24Z

test/helper/ProtractorWeb_test.js

+
+let I;
+let browser;
+const should = require('chai').should();


Unable to resolve path to module 'chai' import/no-unresolved

houndci-bot · 2017-12-05T17:13:24Z

test/helper/ProtractorWeb_test.js

 const fileExists = require('../../lib/utils').fileExists;
+const Protractor = require('../../lib/helper/Protractor');
 const AssertionFailedError = require('../../lib/assert/error');
+const webApiTests = require('./webapi');


Unable to resolve path to module './webapi' import/no-unresolved

houndci-bot · 2017-12-05T17:13:24Z

test/helper/ProtractorWeb_test.js

 const path = require('path');
 const fs = require('fs');
 const fileExists = require('../../lib/utils').fileExists;
+const Protractor = require('../../lib/helper/Protractor');


Unable to resolve path to module '../../lib/helper/Protractor' import/no-unresolved

houndci-bot · 2017-12-05T17:13:24Z

lib/locator.js

@@ -0,0 +1,165 @@
+const xpathLocator = require('./utils').xpathLocator;


Unable to resolve path to module './utils' import/no-unresolved

houndci-bot · 2017-12-05T17:13:25Z

lib/helper/SeleniumWebdriver.js

 const co = require('co');
 const path = require('path');
+const recorder = require('../recorder');
+const ElementNotFound = require('./errors/ElementNotFound');


Unable to resolve path to module './errors/ElementNotFound' import/no-unresolved

houndci-bot · 2017-12-05T17:13:25Z

lib/helper/SeleniumWebdriver.js

 const clearString = require('../utils').clearString;
 const co = require('co');
 const path = require('path');
+const recorder = require('../recorder');


Unable to resolve path to module '../recorder' import/no-unresolved

houndci-bot · 2017-12-05T17:13:25Z

lib/helper/SeleniumWebdriver.js

@@ -1,4 +1,5 @@
 const requireg = require('requireg');
+const Locator = require('../locator');


Unable to resolve path to module '../locator' import/no-unresolved

houndci-bot · 2017-12-05T17:13:25Z

lib/helper/Protractor.js

+    const els = await findFields(this.browser, locator);
+    assertElementExists(els, locator, 'Field');
+    if (this.options.browser !== 'phantomjs') {
+      const remote = require('selenium-webdriver/remote');


Unable to resolve path to module 'selenium-webdriver/remote' import/no-unresolved

houndci-bot · 2017-12-05T17:13:25Z

lib/helper/Protractor.js

+const ElementNotFound = require('./errors/ElementNotFound');
+const Locator = require('../locator');
+const path = require('path');
+const recorder = require('../recorder');


Unable to resolve path to module '../recorder' import/no-unresolved

DavertMik · 2017-12-05T17:45:41Z

.eslintrc.json

    "no-cond-assign": 0,
-    "array-callback-return": 0,
-    "function-paren-newline": 0
+    "import/no-unresolved": 0,


Hound CI can't parse this rule. Also, it depends on current installation settings so strictly following it won't be helpful.

DavertMik · 2017-12-05T17:46:22Z

.eslintrc.json

-    "array-callback-return": 0,
-    "function-paren-newline": 0
+    "import/no-unresolved": 0,
+    "no-await-in-loop": 0,


we have loops where await is used following if conditions. There is no clean way to rework it in Promise.all

DavertMik · 2017-12-05T17:46:40Z

.eslintrc.json

-    "function-paren-newline": 0
+    "import/no-unresolved": 0,
+    "no-await-in-loop": 0,
+    "arrow-body-style": 0


this makes some linex extra long and unreadable

DavertMik added 9 commits December 4, 2017 02:42

refactored webdriverio

6fb93d3

refactotred, updated selenium for travis tests

208a048

updated seleniumwebdriver & protractor

af1fd0b

refactored

ae51683

refactored Protractor helper

ec2f875

refactoring more

4c26659

refactored and merged protractor and webdriver

76b3491

codestyle fixes

3538369

refactored and fixed Nightmare

89d481f

DavertMik force-pushed the refactoring branch from 3e900a0 to 89d481f Compare December 4, 2017 23:45

houndci-bot reviewed Dec 4, 2017

View reviewed changes

houndci-bot reviewed Dec 5, 2017

View reviewed changes

DavertMik added 2 commits December 5, 2017 02:29

codestyles applied

722d086

merged with master

18ac645

DavertMik force-pushed the refactoring branch from c0e0b74 to 18ac645 Compare December 5, 2017 00:31

houndci-bot reviewed Dec 5, 2017

View reviewed changes

DavertMik added 3 commits December 5, 2017 02:32

Merge branch 'master' into refactoring

8077f29

fixed travis and added retries for tests

31a2c1a

Merge branch 'master' into refactoring

d3d210e

houndci-bot reviewed Dec 5, 2017

View reviewed changes

codeceptjs deleted a comment from houndci-bot Dec 5, 2017

DavertMik added 6 commits December 5, 2017 02:41

fixed Protractor codestyle

4610dd7

fixed Appium init

486528e

fixed Appium test

b3724fd

fixed tests

b780761

fixed appium execution

ce64ed4

fixed fragile grabFromCssProperty test

0af2d60

DavertMik added 2 commits December 5, 2017 03:53

fixed appium tests, improved error messages

1d8749d

added back patch to handle accessibility id

155265c

houndci-bot reviewed Dec 5, 2017

View reviewed changes

DavertMik added 9 commits December 5, 2017 04:12

added EOL to locator

1b12a84

fixed locator detection in Appium

d300d0e

improved accessibility_id

dbe7ecb

fixed accessibilityId parsing

2ca2634

changed quick-second groups

8cac086

fixed appium tests and locator

52cc49e

fixed parsing accessibility id

3de643c

changed locator policy for accessid

e048cda

returned back eslint rules

894e428

houndci-bot reviewed Dec 5, 2017

View reviewed changes

remocing import/no-unresolved rule. HoundCI can't run checks on it

7dadc9b

DavertMik commented Dec 5, 2017

View reviewed changes

galkin merged commit 24bf12d into master Dec 5, 2017

galkin deleted the refactoring branch December 5, 2017 18:16

		@@ -0,0 +1,165 @@
		const xpathLocator = require('./utils').xpathLocator;

		@@ -1,4 +1,5 @@
		const requireg = require('requireg');
		const Locator = require('../locator');

Uh oh!

[WIP] Refactoring #800

[WIP] Refactoring #800

Uh oh!

Conversation

DavertMik commented Dec 2, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment