From 5abb4665f7d908774b5e3a0daf7c01f25dcfb91d Mon Sep 17 00:00:00 2001 From: Matthew Mulholland Date: Sat, 2 Jun 2018 16:28:19 +1000 Subject: [PATCH] resolved. --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index 6e7b6fb66..b106950fb 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,6 @@ "unit": "karma start test/unit/karma.conf.js", "e2e": "yarn run pack && (yarn run cucumber:postpack:impl || yarn -v) && yarn run cucumber:report", "e2e:dev": "(yarn run cucumber:postpack:dev || yarn -v) && yarn run cucumber:report", -======= - "e2e": "yarn run pack && (yarn run cucumber:postpack:impl || true) && yarn run cucumber:report", - "e2e:dev": "(yarn run cucumber:postpack:dev || true) && yarn run cucumber:report", ->>>>>>> 2107affe02974388d9ea6cc752a880851d534d36 "cucumber:postpack": "cross-env BABEL_ENV=test nyc cucumber-js --require-module babel-core/register test/features -f json:test/cucumber_report.json", "cucumber:postpack:dev": "cross-env BABEL_ENV=test nyc cucumber-js --require-module babel-core/register --tags @dev test/features -f json:test/cucumber_report.json", "cucumber:postpack:impl": "cross-env BABEL_ENV=test nyc cucumber-js --require-module babel-core/register --tags @impl test/features -f json:test/cucumber_report.json",