cleaning up makefiles, configuring colored mocha

Makefile

@@ -4,49 +4,7 @@ DEFAULT:
 	@echo '  mapping -> build the mapping (implemented only).'
 	@echo '  full_mapping -> build the mapping (full).'
 	@echo '  unsupported_mapping -> build the mapping (unsupported).'
-	@echo ''
-	@echo 'Notes:'
-	@echo '  - For midway and e2e test, BROWSER=[chrome|firefox|explorer|multi].'
-	@echo '  - To test on sauce, set SAUCE_USERNAME/SAUCE_ACCESS_KEY first'
-	@echo ''
-	@echo 'Mobile test targets: '
-	@echo '  test_ios test_iphone test_ipad'
-	@echo '  test_android test_android_phone test_android_tablet'
-
-# test_sauce:
-# 	BROWSER=multi make test_unit test_midway_sauce_connect
-# 	BROWSER=chrome make test_midway_sauce_connect test_e2e_sauce
-# 	BROWSER=firefox make test_midway_sauce_connect test_e2e_sauce
-
-
-# test_travis:
-# ifeq ($(MULTI),true)
-# 	make jshint
-# 	make test_unit
-# ifneq ($(TRAVIS_PULL_REQUEST),false)
-# 	@echo 'Skipping Sauce Labs tests as this is a pull request'
-# else
-# 	@echo make test_midway_sauce_connect
-# endif
-# else 
-# ifneq ($(TRAVIS_PULL_REQUEST),false)
-# 	@echo 'Skipping Sauce Labs tests as this is a pull request'
-# else
-# ifeq ($(BROWSER),all_androids)
-# 	BROWSER=android_tablet make test_midway_mobile_sauce_connect
-# 	BROWSER=android_phone make test_midway_mobile_sauce_connect
-# else ifeq ($(MOBILE),true)
-# 	make test_midway_mobile_sauce_connect
-# else
-# 	make test_midway_sauce_connect
-# 	make test_e2e_sauce
-# endif
-# endif
-# endif
-
-# test_coverage:
-# 	rm -rf coverage
-# 	./node_modules/.bin/istanbul cover test/coverage/run_tests.js --
+	@echo
 
 _dox:
 	@mkdir -p tmp

gulpfile.js

@@ -32,7 +32,7 @@ function buildMochaOpts(opts) {
     flags: {
       u: 'bdd-with-opts',
       R: 'spec',
-      //R: 'nyan',
+      c: true
     },
     bin: path.join(__dirname,  'node_modules/.bin/mocha'),
     concurrency: args.concurrency | process.env.CONCURRENCY || 3

package.json

@@ -78,7 +78,7 @@
     "yargs": "~3.9.1"
   },
   "scripts": {
-    "test": "make test",
-    "test_sauce": "make test_e2e_sauce"
+    "test": "gulp test-unit",
+    "all_tests": "gulp test"
   }
 }