From c0ea515c84271812355c3fe8850d12af1f05f463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoffer=20=C3=85str=C3=B6m?= Date: Tue, 26 Jun 2018 21:47:24 +0200 Subject: [PATCH] fix(protractor): ensure setup tranformation (#273) --- commands/protractor/package.json | 2 ++ commands/protractor/src/index.js | 15 ++++++++++++++- commands/protractor/src/options.js | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/commands/protractor/package.json b/commands/protractor/package.json index 6a0b8f76..03937b5d 100644 --- a/commands/protractor/package.json +++ b/commands/protractor/package.json @@ -22,6 +22,8 @@ "homepage": "https://github.com/qlik-oss/after-work.js#readme", "dependencies": { "@after-work.js/server": "^5.0.0-beta.0", + "@after-work.js/register": "^5.0.0-beta.0", + "@after-work.js/utils": "^5.0.0-beta.0", "extend": "3.0.1", "handlebars": "4.0.11", "highlight.js": "9.12.0", diff --git a/commands/protractor/src/index.js b/commands/protractor/src/index.js index ca535a2a..49515737 100644 --- a/commands/protractor/src/index.js +++ b/commands/protractor/src/index.js @@ -2,6 +2,7 @@ const path = require('path'); const extend = require('extend'); const fs = require('fs'); +const utils = require('@after-work.js/utils'); const options = require('./options'); const protractor = { @@ -24,9 +25,18 @@ const protractor = { }, builder(yargs) { return yargs - .options(options); + .options(options) + .coerce('babel', utils.coerceBabel) + .coerce('typescript', utils.coerceTypescript); }, handler(argv) { + argv.instrument = { //eslint-disable-line + testExclude: { + shouldInstrument() { + return false; + }, + }, + }; if (argv.presetEnv) { require(argv.presetEnv); } @@ -45,6 +55,9 @@ const protractor = { } } const config = protractor.getConfig(argv); + if (argv.hookRequire) { + require('@after-work.js/register')(argv); + } argv.require.map(require); if (argv.glob.length) { config.specs = argv.glob; diff --git a/commands/protractor/src/options.js b/commands/protractor/src/options.js index a946b7f5..8c94ee5c 100644 --- a/commands/protractor/src/options.js +++ b/commands/protractor/src/options.js @@ -46,7 +46,7 @@ module.exports = { }, type: 'object', }, - tsc: { + typescript: { description: 'Path to typescript compiler module', default: 'typescript', type: 'string',