Split functional tests (fixtures and legacy-fixtures) - part 1 of #617 (#619)

* Split functional tests (legacy and new) - part 1 of #617

* Restore /legacy/api/click tests

Author: AlexanderMoskovkin

.travis.yml

@@ -13,6 +13,8 @@ matrix:
     env: GULP_TASK="test-client-travis-mobile"
   - node_js: "stable"
     env: GULP_TASK="test-functional"
+  - node_js: "stable"
+    env: GULP_TASK="test-functional-legacy"
  fast_finish: true
 
 branches:

Gulpfile.js

@@ -428,12 +428,21 @@ gulp.task('publish-website', ['build-website'], function () {
 
 gulp.task('test-docs', ['test-website', 'lint']);
 
-gulp.task('test-functional', ['build'], function () {
+
+function testFunctional (fixturesDir) {
     return gulp
-        .src(['test/functional/setup.js', 'test/functional/**/test.js'])
+        .src(['test/functional/setup.js', fixturesDir + '/**/test.js'])
         .pipe(mocha({
             ui:       'bdd',
             reporter: 'spec',
             timeout:  typeof v8debug === 'undefined' ? 30000 : Infinity // NOTE: disable timeouts in debug
         }));
+}
+
+gulp.task('test-functional', ['build'], function () {
+    return testFunctional('test/functional/fixtures');
+});
+
+gulp.task('test-functional-legacy', ['build'], function () {
+    return testFunctional('test/functional/legacy-fixtures');
 });

test/functional/config.js

@@ -40,7 +40,7 @@ module.exports = {
     },
 
     site: {
-        viewsPath: './test/functional/fixtures/',
+        viewsPath: './test/functional/',
         port1:     3000,
         port2:     3001
     }

test/functional/fixtures/.eslintrc

@@ -3,11 +3,6 @@
     "no-unused-expressions": 0
   },
   "globals": {
-    "handleConfirm": false,
-    "handleBeforeUnload": false,
-    "handleAlert": false,
-    "handlePrompt": false,
-    "getInput": true,
     "fixture": true
   }
 }

test/functional/fixtures/api/es-next/before-after-each-hooks/test.js

@@ -15,7 +15,7 @@ describe('[API] beforeEach/afterEach hooks', function () {
 
                 expect(errs[0].indexOf(
                     '- Error in afterEach hook - ' +
-                    'Error on page "http://localhost:3000/api/es-next/before-after-each-hooks/pages/index.html":  ' +
+                    'Error on page "http://localhost:3000/fixtures/api/es-next/before-after-each-hooks/pages/index.html":  ' +
                     'Uncaught Error: [beforeEach][test][afterEach]'
                 )).eql(0);
 
@@ -28,7 +28,7 @@ describe('[API] beforeEach/afterEach hooks', function () {
             .catch(function (errs) {
                 expect(errs[0].indexOf(
                     '- Error in beforeEach hook - ' +
-                    'Error on page "http://localhost:3000/api/es-next/before-after-each-hooks/pages/index.html":  ' +
+                    'Error on page "http://localhost:3000/fixtures/api/es-next/before-after-each-hooks/pages/index.html":  ' +
                     'Uncaught Error: [beforeEach]'
                 )).eql(0);
 
@@ -40,13 +40,13 @@ describe('[API] beforeEach/afterEach hooks', function () {
         return runTests('./testcafe-fixtures/fail-in-test.js', 'Test', { shouldFail: true, only: 'chrome' })
             .catch(function (errs) {
                 expect(errs[0].indexOf(
-                    'Error on page "http://localhost:3000/api/es-next/before-after-each-hooks/pages/index.html":  ' +
+                    'Error on page "http://localhost:3000/fixtures/api/es-next/before-after-each-hooks/pages/index.html":  ' +
                     'Uncaught Error: [beforeEach] '
                 )).eql(0);
 
                 expect(errs[1].indexOf(
                     '- Error in afterEach hook - ' +
-                    'Error on page "http://localhost:3000/api/es-next/before-after-each-hooks/pages/index.html":  ' +
+                    'Error on page "http://localhost:3000/fixtures/api/es-next/before-after-each-hooks/pages/index.html":  ' +
                     'Uncaught Error: [beforeEach][afterEach]'
                 )).eql(0);
 

test/functional/fixtures/api/es-next/before-after-each-hooks/testcafe-fixtures/fail-in-before-each.js

@@ -1,5 +1,5 @@
 fixture `Fail in beforeEach`
-    .page `http://localhost:3000/api/es-next/before-after-each-hooks/pages/index.html`
+    .page `http://localhost:3000/fixtures/api/es-next/before-after-each-hooks/pages/index.html`
     .beforeEach(async t => {
         await t
             .click('#beforeEach')

test/functional/fixtures/api/es-next/before-after-each-hooks/testcafe-fixtures/fail-in-test.js

@@ -1,5 +1,5 @@
 fixture `Fail in test`
-    .page `http://localhost:3000/api/es-next/before-after-each-hooks/pages/index.html`
+    .page `http://localhost:3000/fixtures/api/es-next/before-after-each-hooks/pages/index.html`
     .beforeEach(async t => await t.click('#beforeEach'))
     .afterEach(async t => {
         await t

test/functional/fixtures/api/es-next/before-after-each-hooks/testcafe-fixtures/run-all.js

@@ -1,5 +1,5 @@
 fixture `Run all`
-    .page `http://localhost:3000/api/es-next/before-after-each-hooks/pages/index.html`
+    .page `http://localhost:3000/fixtures/api/es-next/before-after-each-hooks/pages/index.html`
     .beforeEach(async t => await t.click('#beforeEach'))
     .afterEach(async t => {
         await t

test/functional/fixtures/api/es-next/click/test.js

@@ -55,7 +55,7 @@ describe('[API] t.click()', function () {
                     'by a Selector, but "number" was passed.'
                 );
                 expect(errs[0]).to.contains(
-                    '7 |    .page `http://localhost:3000/api/es-next/click/pages/index.html`;' +
+                    '7 |    .page `http://localhost:3000/fixtures/api/es-next/click/pages/index.html`;' +
                     ' 8 |' +
                     ' 9 |const getClickOffset = ClientFunction(() => window.clickOffset);' +
                     ' 10 |' +

test/functional/fixtures/api/es-next/click/testcafe-fixtures/click-test.js

@@ -4,7 +4,7 @@ import { expect } from 'chai';
 import { ClientFunction, Selector } from 'testcafe';
 
 fixture `Click`
-    .page `http://localhost:3000/api/es-next/click/pages/index.html`;
+    .page `http://localhost:3000/fixtures/api/es-next/click/pages/index.html`;
 
 const getClickOffset = ClientFunction(() => window.clickOffset);