add ability to run tests in headless mode, generally clean up all the npm scripts

README.md

@@ -110,7 +110,10 @@ cp test.config.example.js test.config.js
 vim test.config.js
 
 # Run the test suite
-npm run test
+npm test
+
+# Or, if you want to watch the tests run...
+npm run test:watch
 ```
 
 

package.json

@@ -24,11 +24,16 @@
         "clean": "rm -Rf dist/",
         "bundle": "gulp && web-ext -s add-on -a dist build --overwrite-dest",
         "firefox": "web-ext -s add-on run",
-    "test:lint": "node_modules/eslint/bin/eslint.js .",
-    "test:lint:fix": "node_modules/eslint/bin/eslint.js --fix .",
-    "test:func": "npm run clean; npm run bundle && ln -s `ls dist/` dist/webapi_manager.zip && node_modules/mocha/bin/mocha test/functional/*.js",
-    "test:func:block": "npm run clean; npm run bundle && ln -s `ls dist/` dist/webapi_manager.zip && node_modules/mocha/bin/mocha test/functional/block.js",
-    "test": "npm run test:lint && npm run test:func"
+        "lint": "node_modules/eslint/bin/eslint.js .",
+        "lint:fix": "node_modules/eslint/bin/eslint.js --fix .",
+        "test": "npm run clean; npm run bundle && ln -s `ls dist/` dist/webapi_manager.zip && node_modules/mocha/bin/mocha test/functional/*.js",
+        "test:watch": "npm test --watch"
+    },
+    "pre-push": {
+        "run": [
+            "lint",
+            "test"
+        ]
     },
     "devDependencies": {
         "assert": "^1.4.1",

test/functional/lib/utils.js

@@ -80,8 +80,15 @@ module.exports.promiseSetBlockingRules = function (driver, standardsToBlock) {
 
 module.exports.promiseGetDriver = function () {
 
+    const binary = new firefox.Binary();
+
+    if (process.argv.indexOf("--watch") === -1) {
+        binary.addArguments("--headless");
+    }
+
     const driver = new webdriver.Builder()
         .forBrowser("firefox")
+        .setFirefoxOptions(new firefox.Options().setBinary(binary))
         .build();
 
     driver.setContext(Context.CHROME);