aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-09-14 07:52:38 +0800
committerkumavis <aaron@kumavis.me>2017-09-14 07:52:38 +0800
commitcbff5fd450ac0a55a9ef7b48b0ce540b66dfca6b (patch)
tree197bfd9b0ec7df95f9a2c3cf466c30fec08f1d34
parent56db3999adeaec1733218173b260bf74fa63ccbe (diff)
downloadtangerine-wallet-browser-cbff5fd450ac0a55a9ef7b48b0ce540b66dfca6b.tar
tangerine-wallet-browser-cbff5fd450ac0a55a9ef7b48b0ce540b66dfca6b.tar.gz
tangerine-wallet-browser-cbff5fd450ac0a55a9ef7b48b0ce540b66dfca6b.tar.bz2
tangerine-wallet-browser-cbff5fd450ac0a55a9ef7b48b0ce540b66dfca6b.tar.lz
tangerine-wallet-browser-cbff5fd450ac0a55a9ef7b48b0ce540b66dfca6b.tar.xz
tangerine-wallet-browser-cbff5fd450ac0a55a9ef7b48b0ce540b66dfca6b.tar.zst
tangerine-wallet-browser-cbff5fd450ac0a55a9ef7b48b0ce540b66dfca6b.zip
tests - mascara - move temp build files into dist/mascara
-rw-r--r--package.json8
-rw-r--r--test/mascara.conf.js12
2 files changed, 10 insertions, 10 deletions
diff --git a/package.json b/package.json
index 8ba6e16cb..c4a19a52c 100644
--- a/package.json
+++ b/package.json
@@ -28,10 +28,10 @@
"deleteNotice": "node notices/notice-delete.js",
"mascara": "node ./mascara/example/server",
"testMascara": "npm run buildMascara && karma start test/mascara.conf.js",
- "buildMascara": "npm run buildMascaraUi && npm run buildMascaraBackground && npm run buildMascaraTests",
- "buildMascaraUi": "browserify mascara/test/test-ui.js -o mascara/test/ui-bundle.js",
- "buildMascaraBackground": "browserify mascara/src/background.js -o mascara/test/background.js",
- "buildMascaraTests": "browserify test/integration/lib/first-time.js -o mascara/test/test-bundle.js"
+ "buildMascara": "mkdir -p dist/mascara && npm run buildMascaraUi && npm run buildMascaraBackground && npm run buildMascaraTests",
+ "buildMascaraUi": "browserify mascara/test/test-ui.js -o dist/mascara/ui.js",
+ "buildMascaraBackground": "browserify mascara/src/background.js -o dist/mascara/background.js",
+ "buildMascaraTests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js"
},
"browserify": {
"transform": [
diff --git a/test/mascara.conf.js b/test/mascara.conf.js
index 8e8fa2cdf..b4ec5846f 100644
--- a/test/mascara.conf.js
+++ b/test/mascara.conf.js
@@ -2,13 +2,13 @@ const getBaseConfig = require('./base.conf.js')
module.exports = function(config) {
const settings = getBaseConfig(config)
- settings.files.push('mascara/test/ui-bundle.js')
- settings.files.push('mascara/test/test-bundle.js')
- // settings.files.push('test/integration/bundle.js')
- settings.files.push({ pattern: 'mascara/test/background.js', watched: false, included: false, served: true }),
- // /background.js
- settings.proxies['/background.js'] = '/base/mascara/test/background.js'
+ // ui and tests
+ settings.files.push('dist/mascara/ui.js')
+ settings.files.push('dist/mascara/tests.js')
+ // service worker background
+ settings.files.push({ pattern: 'dist/mascara/background.js', watched: false, included: false, served: true }),
+ settings.proxies['/background.js'] = '/base/dist/mascara/background.js'
config.set(settings)
}