Implement t.ctx

DevExpress · Jan 3, 2017 · f62d05e · f62d05e
1 parent 0303e8d
commit f62d05e
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 19 deletions.
diff --git a/src/api/globals/testing-unit.js b/src/api/globals/testing-unit.js
@@ -33,13 +33,13 @@ export default class TestingUnit {
         throw new Error('Not implemented');
     }
 
-    _only$FLAG () {
+    _only$getter () {
         this.only = true;
 
         return this.apiOrigin;
     }
 
-    _skip$FLAG () {
+    _skip$getter () {
         this.skip = true;
 
         return this.apiOrigin;

diff --git a/src/api/test-controller.js b/src/api/test-controller.js
@@ -44,6 +44,7 @@ export default class TestController {
         this.testRun              = testRun;
         this.executionChain       = Promise.resolve();
         this.callsiteWithoutAwait = null;
+        this.ctxStorage           = testRun.ctxStorage;
     }
 
     // NOTE: we track missing `awaits` by exposing a special custom Promise to user code.
@@ -114,6 +115,10 @@ export default class TestController {
     // We need implementation methods to obtain correct callsites. If we use plain API
     // methods in chained wrappers then we will have callsite for the wrapped method
     // in this file instead of chained method callsite in user code.
+    _ctx$getter () {
+        return this.ctxStorage;
+    }
+
     _click$ (selector, options) {
         return this._enqueueAction('click', ClickCommand, { selector, options });
     }

diff --git a/src/test-run/index.js b/src/test-run/index.js
@@ -52,6 +52,8 @@ export default class TestRun extends Session {
         this.pendingRequest   = null;
         this.pendingPageError = null;
 
+        this.ctxStorage = {};
+
         this.errs = [];
 
         this.lastDriverStatusId       = null;

diff --git a/src/utils/delegated-api.js b/src/utils/delegated-api.js
@@ -1,4 +1,4 @@
-const API_IMPLEMENTATION_METHOD_RE = /^_(\S+)\$(FLAG)?$/;
+const API_IMPLEMENTATION_METHOD_RE = /^_(\S+)\$(getter)?$/;
 
 export function getDelegatedAPIList (src) {
     return Object
@@ -8,9 +8,9 @@ export function getDelegatedAPIList (src) {
 
             if (match) {
                 return {
-                    srcProp: prop,
-                    apiProp: match[1],
-                    isFlag:  match[2]
+                    srcProp:  prop,
+                    apiProp:  match[1],
+                    isGetter: match[2]
                 };
             }
 
@@ -20,7 +20,7 @@ export function getDelegatedAPIList (src) {
 }
 
 export function delegateAPI (src, dest, apiList, proxyMethod, useDynamicMethodCtx) {
-    apiList.forEach(({ srcProp, apiProp, isFlag }) => {
+    apiList.forEach(({ srcProp, apiProp, isGetter }) => {
         var fn = function (...args) {
             if (proxyMethod)
                 proxyMethod();
@@ -30,7 +30,7 @@ export function delegateAPI (src, dest, apiList, proxyMethod, useDynamicMethodCt
             return ctx[srcProp](...args);
         };
 
-        if (isFlag)
+        if (isGetter)
             Object.defineProperty(dest, apiProp, { get: fn });
 
         else

diff --git a/test/functional/fixtures/.eslintrc b/test/functional/fixtures/.eslintrc
@@ -1,6 +1,8 @@
 {
   "rules": {
-    "no-unused-expressions": 0
+    "no-unused-expressions": 0,
+    "no-spaced-func": 0,
+    "no-unexpected-multiline": 0
   },
   "globals": {
     "fixture": true,

diff --git a/test/functional/fixtures/api/es-next/hooks/test.js b/test/functional/fixtures/api/es-next/hooks/test.js
@@ -1,4 +1,5 @@
 var expect = require('chai').expect;
+var uniq   = require('lodash').uniq;
 
 // NOTE: we run tests in chrome only, because we mainly test server API functionality.
 describe('[API] fixture.beforeEach/fixture.afterEach hooks', function () {
@@ -64,5 +65,27 @@ describe('[API] test.before/test.after hooks', function () {
                 expect(errs[0]).contains('[testBefore][test][testAfter]');
             });
     });
+});
+
+describe('[API] t.ctx', function () {
+    it('Should pass context object to tests and hooks', function () {
+        return runTests('./testcafe-fixtures/run-all.js', 't.ctx', { shouldFail: true, only: 'chrome,ie,firefox' })
+            .catch(function (errs) {
+                var browsers = [];
+
+                Object.keys(errs).forEach(function (browser) {
+                    var ctxJson = errs[browser][0].match(/###(.+)###/)[1];
+                    var ctx     = JSON.parse(ctxJson);
 
+                    // NOTE: check that we have same browser for each stage
+                    expect(uniq(ctx.browsers).length).eql(1);
+                    expect(ctx.steps).eql(['before', 'test', 'after']);
+
+                    browsers.push(ctx.browsers[0]);
+                });
+
+                // NOTE: check that each context is from different browsers
+                expect(uniq(browsers).length).eql(3);
+            });
+    });
 });
diff --git a/test/functional/fixtures/api/es-next/hooks/testcafe-fixtures/run-all.js b/test/functional/fixtures/api/es-next/hooks/testcafe-fixtures/run-all.js
@@ -17,12 +17,39 @@ test('Test2', async t => {
     await t.click('#test');
 });
 
-test('Test3', async t => {
-    await t.click('#test');
-}).before(async t => {
-    await t.click('#testBefore');
-}).after(async t => {
-    await t
-        .click('#testAfter')
-        .click('#failAndReport');
-});
+test
+    .before(async t => {
+        await t.click('#testBefore');
+    })
+    ('Test3', async t => {
+        await t.click('#test');
+    })
+    .after(async t => {
+        await t
+            .click('#testAfter')
+            .click('#failAndReport');
+    });
+
+test
+    .before(async t => {
+        t.ctx.val = {
+            browsers: [],
+            steps:    []
+        };
+
+        t.ctx.val.browsers.push(await t.eval(()=>navigator.userAgent));
+        t.ctx.val.steps.push('before');
+    })
+    ('t.ctx', async t => {
+        // NOTE: check that context is correctly exposed in chained calls
+        const ctx = t.click('#test').ctx;
+
+        ctx.val.browsers.push(await t.eval(()=>navigator.userAgent));
+        ctx.val.steps.push('test');
+    })
+    .after(async t => {
+        t.ctx.val.browsers.push(await t.eval(()=>navigator.userAgent));
+        t.ctx.val.steps.push('after');
+
+        throw `###${JSON.stringify(t.ctx.val)}###`;
+    });
diff --git a/...onal/fixtures/api/es-next/navigate-to-and-test-page/testcafe-fixtures/navigate-to-test.js b/...onal/fixtures/api/es-next/navigate-to-and-test-page/testcafe-fixtures/navigate-to-test.js
@@ -10,6 +10,8 @@ test('Incorrect protocol', async t => {
     await t.navigateTo('ftp://localhost:3000/fixtures/api/es-next/navigate-to-and-test-page/pages/index.html');
 });
 
-test.page('http://localhost:3000/fixtures/api/es-next/navigate-to-and-test-page/pages/navigation.html')('Page directive', async t => {
+test
+    .page `http://localhost:3000/fixtures/api/es-next/navigate-to-and-test-page/pages/navigation.html`
+('Page directive', async t => {
     await t.click('#button');
 });