From 6f76b7d905099813b28c660b8af9647e1ec4c483 Mon Sep 17 00:00:00 2001
From: k88hudson <k88hudson@gmail.com>
Date: Fri, 5 Feb 2016 11:25:43 -0500
Subject: [PATCH] chore(ci): #51 Fix jpm binary path for travis

---
 .travis.yml    | 3 +++
 package.json   | 4 ++--
 yamscripts.yml | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9ae81271..9a9b28db4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,10 @@ before_script:
   - ./node_modules/.bin/mozilla-download --branch mozilla-central --product firefox firefox
   - export FIREFOX_PATH=$TRAVIS_BUILD_DIR/firefox/firefox
   - export PATH=$FIREFOX_PATH:$PATH
+  - export JPM_FIREFOX_BINARY=`which firefox`
   - firefox -v
+  - echo $JPM_FIREFOX_BINARY
 
 script:
+
   - npm run travis
diff --git a/package.json b/package.json
index 116c9ec77..ee8b93f34 100644
--- a/package.json
+++ b/package.json
@@ -79,13 +79,13 @@
     "firefox": "jpm run -b nightly",
     "test": "npm-run-all test:*",
     "test:lint": "eslint .",
-    "test:jpm": "jpm test",
+    "test:jpm": "jpm test -b nightly",
     "test:karma": "karma start",
     "tdd": "karma start --no-single-run",
     "package": "jpm xpi && mv @activity-streams-$npm_package_version.xpi dist/activity-streams-$npm_package_version.xpi",
     "travis": "npm-run-all travis:*",
     "travis:eslint": "npm run test:lint",
-    "travis:jpm": "jpm test -b $FIREFOX_PATH",
+    "travis:jpm": "jpm test -b $JPM_FIREFOX_BINARY -v",
     "travis:karma": "karma start --reporters mocha,coverage,coveralls",
     "precommit": "npm run test:lint && npm run yamscripts",
     "help": "yamscripts help",
diff --git a/yamscripts.yml b/yamscripts.yml
index 1185a0b2e..8dfc81ec6 100644
--- a/yamscripts.yml
+++ b/yamscripts.yml
@@ -27,7 +27,7 @@ scripts:
     # test:lint: Run eslint
     lint: eslint .
     # test:jpm: Run jpm tests
-    jpm: jpm test
+    jpm: jpm test -b nightly
     # test:karma: Run content tests only
     karma: karma start
 
@@ -40,7 +40,7 @@ scripts:
   # This is for ci
   travis:
     eslint: =>test:lint
-    jpm: jpm test -b $FIREFOX_PATH
+    jpm: jpm test -b $JPM_FIREFOX_BINARY -v
     karma: karma start --reporters mocha,coverage,coveralls
 
   # This is just to make sure we don't make commits with failing tests