aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-03-10 05:48:48 +0800
committerkumavis <aaron@kumavis.me>2018-03-10 05:48:48 +0800
commit35801966508355d4aaf819d9bbf2c570a2a445f3 (patch)
tree70382287dc35cbb5845c7c6f9120fb3c2456e76c
parent7ad1421f61ec91b7562a72dc2b067fcc9bec8faa (diff)
downloadtangerine-wallet-browser-35801966508355d4aaf819d9bbf2c570a2a445f3.tar
tangerine-wallet-browser-35801966508355d4aaf819d9bbf2c570a2a445f3.tar.gz
tangerine-wallet-browser-35801966508355d4aaf819d9bbf2c570a2a445f3.tar.bz2
tangerine-wallet-browser-35801966508355d4aaf819d9bbf2c570a2a445f3.tar.lz
tangerine-wallet-browser-35801966508355d4aaf819d9bbf2c570a2a445f3.tar.xz
tangerine-wallet-browser-35801966508355d4aaf819d9bbf2c570a2a445f3.tar.zst
tangerine-wallet-browser-35801966508355d4aaf819d9bbf2c570a2a445f3.zip
test - breakout npm script for building for integration tests
-rw-r--r--.circleci/config.yml4
-rw-r--r--package.json3
2 files changed, 4 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea6ce72b2..527fb1b9e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,8 +54,8 @@ jobs:
- restore_cache:
key: scss-cache-{{ checksum "scss_checksum" }}
- run:
- name: Build Scss
- command: gulp build:scss
+ name: Build for integration tests
+ command: test:integration:build
- save_cache:
key: scss-cache-{{ checksum "scss_checksum" }}
paths:
diff --git a/package.json b/package.json
index fd2554f73..e5efe6ef5 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
"test": "npm run lint && npm run test:coverage && npm run test:integration",
"test:unit": "METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
"test:single": "METAMASK_ENV=test mocha --require test/helper.js",
- "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara",
+ "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
+ "test:integration:build": "gulp build:scss",
"test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
"test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
"test:flat": "npm run test:flat:build && karma start test/flat.conf.js",