From 5a6ce3e902ed40d9bbd81772dc8eb20057bfc017 Mon Sep 17 00:00:00 2001 From: k88hudson Date: Thu, 4 Aug 2016 13:55:08 -0700 Subject: [PATCH] chore(build): #1028 Use nightly for test/run As of Firefox 48.0, jpm run and jpm test no longer work on Firefox Release channel, since unsigned add-ons are not allowed. --- package.json | 4 ++-- yamscripts.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c6b7bf323..9521eb5d0 100644 --- a/package.json +++ b/package.json @@ -167,12 +167,12 @@ "start:css": "npm run bundle:css && npm run bundle:css -- -w", "start:html": "npm run bundle:html -- --baseUrl http://localhost:1963/ --csp off", "start:server": "live-server data/content --port=1963 --no-browser", - "firefox": "npm run bundle:webpackAddon && jpm run --prefs ./dev-prefs.json", + "firefox": "npm run bundle:webpackAddon && jpm run -b nightly --prefs ./dev-prefs.json", "test": "npm-run-all test:*", "pretest": "npm run bundle && npm run copyTestImages && npm run copyTopSitesJson", "test:lint": "eslint . && jscs . && sass-lint -v -q", "test:checkbinary": "echo \"JPM_FIREFOX_BINARY: ${JPM_FIREFOX_BINARY}\"", - "test:jpm": "jpm test -b ${JPM_FIREFOX_BINARY:-\"firefox\"} --prefs ./test-prefs.json -v", + "test:jpm": "jpm test -b ${JPM_FIREFOX_BINARY:-\"nightly\"} --prefs ./test-prefs.json -v", "test:karma": "NODE_ENV=test karma start", "posttest": "cat logs/reports/coverage/text-summary.txt", "tdd": "npm run test:karma -- --no-single-run --browsers Chrome", diff --git a/yamscripts.yml b/yamscripts.yml index a0290df53..eb735794f 100644 --- a/yamscripts.yml +++ b/yamscripts.yml @@ -38,7 +38,7 @@ scripts: server: live-server data/content --port=1963 --no-browser # firefox: Launch addon with jpm run - firefox: =>bundle:webpackAddon && jpm run --prefs ./dev-prefs.json + firefox: =>bundle:webpackAddon && jpm run -b nightly --prefs ./dev-prefs.json # test: Run all tests once test: @@ -47,7 +47,7 @@ scripts: lint: eslint . && jscs . && sass-lint -v -q checkbinary: echo "JPM_FIREFOX_BINARY: ${JPM_FIREFOX_BINARY}" # test:jpm: Run jpm tests - jpm: jpm test -b ${JPM_FIREFOX_BINARY:-"firefox"} --prefs ./test-prefs.json -v + jpm: jpm test -b ${JPM_FIREFOX_BINARY:-"nightly"} --prefs ./test-prefs.json -v # test:karma: Run content tests only karma: NODE_ENV=test karma start post: cat logs/reports/coverage/text-summary.txt