feat(tees-drivers): enhance tees drivers for extensibility

jskits · Oct 7, 2019 · 1ef41c4 · 1ef41c4
1 parent 5e79b96
commit 1ef41c4
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
diff --git a/packages/tees-environment/src/global.js b/packages/tees-environment/src/global.js
@@ -30,11 +30,25 @@ function checkValidBrowsers(process) {
 }
 
 const createDriver = (name, inputSetting = {}) => {
-  const {
+  let config;
+  try {
+    const { globals } = getConfig(process);
+    // eslint-disable-next-line
+    config = require(globals.configPath);
+  } catch (error) {
+    console.error(error);
+    process.exit();
+    return;
+  }
+  let {
     Driver,
     setting,
     Query
   } = e2eDrivers[name];
+  if (config && config.drivers && config.drivers[name]) {
+    Driver = config.drivers[name].Driver || Driver;
+    Query = config.drivers[name].Query || Query;
+  }
   // TDDO inputSetting for browser
   const options = {
     driver: {

diff --git a/packages/tees-integration/e2e.config.js b/packages/tees-integration/e2e.config.js
@@ -1,3 +1,5 @@
+const { Query } = require('./integration-test/lib/puppeteerQuery');
+
 module.exports = {
   selectorLabel: 'class',
   params: {
@@ -8,6 +10,11 @@ module.exports = {
       }
     }
   },
+  drivers: {
+    puppeteer: {
+      Query,
+    }
+  },
   lookupConfig({
     config,
     tag

diff --git a/packages/tees-integration/integration-test/index.js b/packages/tees-integration/integration-test/index.js
@@ -3,6 +3,6 @@ describe('Default page', () => {
     title: 'check text include "Learn React" in default page',
   }, async ({ page }) => {
     const text = await $(page).getText('@App-link');
-    expect(text).toMatch('Learn React');
+    expect(text).toEqual('Learn React');
   });
 });
diff --git a/packages/tees-integration/integration-test/lib/puppeteerQuery.js b/packages/tees-integration/integration-test/lib/puppeteerQuery.js
@@ -0,0 +1,13 @@
+const { Query: BaseQuery  } = require('tees-drivers/src/puppeteer');
+
+class Query extends BaseQuery {
+  async getText(...args) {
+    return await super.getText(...args);
+  }
+}
+
+module.exports = {
+  Query,
+};
+
+
diff --git a/packages/tees-integration/package.json b/packages/tees-integration/package.json
@@ -68,7 +68,8 @@
     "build": "node scripts/build.js",
     "forever:start": "forever start scripts/start.js",
     "forever:stop": "forever stop scripts/start.js",
-    "test": "yarn forever:start && wait-on tcp:3000 && tees run integration-test/** -H && yarn forever:stop"
+    "test:tees": "tees run integration-test/** -H",
+    "test": "yarn forever:start && wait-on tcp:3000 && yarn test:tees && yarn forever:stop"
   },
   "eslintConfig": {
     "extends": "react-app"