chore(mc): Fix scripts to handle activity-stream enabled on nightly (#…

…2892)

package.json

@@ -251,8 +251,8 @@
     "bundle:html": "node ./bin/generate-html.js > data/content/activity-streams.html",
     "postbundle": "du -hs ./data/content/*",
     "bundlestats": "NODE_ENV=production webpack --json | webpack-bundle-size-analyzer",
-    "mochitest": "(cd ../mozilla-central && ./mach mochitest --setpref browser.newtabpage.activity-stream.enabled=true  --extra-mozinfo-json=$PWD/browser/extensions/activity-stream/test/mozinfo.json browser/extensions/activity-stream/test/functional/mochitest )",
-    "mochitest-debug": "(cd ../mozilla-central && ./mach mochitest --jsdebugger --setpref browser.newtabpage.activity-stream.enabled=true --extra-mozinfo-json=$PWD/browser/extensions/activity-stream/test/mozinfo.json browser/extensions/activity-stream/test/functional/mochitest )",
+    "mochitest": "(cd ../mozilla-central && ./mach mochitest browser/extensions/activity-stream/test/functional/mochitest )",
+    "mochitest-debug": "(cd ../mozilla-central && ./mach mochitest --jsdebugger browser/extensions/activity-stream/test/functional/mochitest )",
     "buildmc": "npm-run-all buildmc:*",
     "prebuildmc": "rimraf ../mozilla-central/browser/extensions/activity-stream",
     "buildmc:webpack": "webpack --config webpack.system-addon.config.js",

system-addon/moz.build

@@ -16,3 +16,5 @@ FINAL_TARGET_PP_FILES.features['activity-stream@mozilla.org'] += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+BROWSER_CHROME_MANIFESTS += ['test/functional/mochitest/browser.ini']

system-addon/test/functional/mochitest/browser.ini

@@ -1,9 +1,4 @@
 [DEFAULT]
-# XXX This defaults to forcing activity-stream tests to be skipped in m-c,
-# since, as of this writing, mozilla-central itself is still turned off.
-# The tests can be run locally using 'npm run mochitest' which does various
-# overrides.
-skip-if=!activity_stream
 support-files =
   blue_page.html
 

yamscripts.yml

@@ -32,17 +32,13 @@ scripts:
 # bundlestats: Display bundle stats
   bundlestats: NODE_ENV=production webpack --json | webpack-bundle-size-analyzer
 
-  # Run the activity-stream mochitests.  Right now, a-s is turned off in
-  # m-c, so we have to locally force them on with the --set-pref.  In m-c,
-  # the tests are skipped, and the --extra-mozinfo-json is used to force them
-  # to run locally too.
-  mochitest: (cd ../mozilla-central && ./mach mochitest --setpref browser.newtabpage.activity-stream.enabled=true  --extra-mozinfo-json=$PWD/browser/extensions/activity-stream/test/mozinfo.json browser/extensions/activity-stream/test/functional/mochitest )
+  # Run the activity-stream mochitests
+  mochitest: (cd ../mozilla-central && ./mach mochitest browser/extensions/activity-stream/test/functional/mochitest )
 
   # Run the activity-stream mochitests with the browser toolbox debugger.
   # Often handy in combination with adding a "debugger" statement in your
-  # mochitest somewhere.  See the comment for the mochitest target for more
-  # details about how this is implemented.
-  mochitest-debug: (cd ../mozilla-central && ./mach mochitest --jsdebugger --setpref browser.newtabpage.activity-stream.enabled=true --extra-mozinfo-json=$PWD/browser/extensions/activity-stream/test/mozinfo.json browser/extensions/activity-stream/test/functional/mochitest )
+  # mochitest somewhere.
+  mochitest-debug: (cd ../mozilla-central && ./mach mochitest --jsdebugger browser/extensions/activity-stream/test/functional/mochitest )
 
 # buildmc: Export the bootstraped add-on to mozilla central
   buildmc: