Merge pull request #52 from mozilla/gh51

fix travis

.jpmignore

@@ -1,9 +1,20 @@
-.*
-*
-!/data/**
-!/lib/**
-!LICENSE
-!README.md
-!package.json
-!content-src/lib/ActionManager.js
-!content-src/actions/action-manager.js
+.DS_Store
+.git/
+npm-debug.log
+content-test/
+dist/
+firefox/
+logs/
+node_modules/
+.babelrc
+.eslintignore
+.gitignore
+.jpmignore
+.travis.yml
+config.default.yml
+config.yml
+karma.conf.js
+npm-shrinkwrap.json
+webpack.config.js
+yamscripts.yml
+dev-prefs.json

.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

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",

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