dropped jscov in favour of istanbul

mashpie · Feb 7, 2016 · b59ffe1 · b59ffe1
1 parent 2eb21ea
commit b59ffe1
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 26 deletions.
diff --git a/Makefile b/Makefile
@@ -1,17 +1,12 @@
-REPORTER = spec
-
 test:
-	mocha --reporter $(REPORTER)
-
-coverage: lib-cov
-	@EXPRESS_COV=1 $(MAKE) test REPORTER=html-cov > coverage.html
+	mocha
 
-lib-cov:
-	@jscoverage i18n.js i18n-cov.js
+cover:
+	istanbul cover mocha
 
 examples:
 	for example in examples/*/test.js ; do \
-		mocha --reporter $(REPORTER) $$example; \
+		mocha $$example; \
 	done
 
 all: test examples

diff --git a/test/i18n.api.js b/test/i18n.api.js
@@ -1,7 +1,7 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
 // now with coverage suport
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
     should = require("should");
 
 describe('Module API', function () {

diff --git a/test/i18n.configure.js b/test/i18n.configure.js
@@ -1,6 +1,6 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
     should = require("should"),
     fs = require('fs');
 

diff --git a/test/i18n.configureLocales.js b/test/i18n.configureLocales.js
@@ -1,11 +1,11 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
   should = require("should"),
   fs = require('fs'),
   path = require('path');
 
-var i18nPath = process.env.EXPRESS_COV ? 'i18n-cov' : 'i18n';
+var i18nPath = 'i18n';
 var i18nFilename = path.resolve(i18nPath + '.js');
 
 function reconfigure(config) {

diff --git a/test/i18n.configurePermissions.js b/test/i18n.configurePermissions.js
@@ -1,6 +1,6 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
     should = require("should"),
     path = require("path"),
     fs = require('fs');

diff --git a/test/i18n.defaults.js b/test/i18n.defaults.js
@@ -1,6 +1,6 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
     should = require("should"),
     fs = require('fs');
 

diff --git a/test/i18n.fallbacks.js b/test/i18n.fallbacks.js
@@ -1,7 +1,7 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
 // now with coverage suport
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
   should = require("should"),
     path = require("path");
 
@@ -17,7 +17,7 @@ describe('Fallbacks', function () {
   describe('Fallback to language', function () {
     beforeEach(function () {
       // Force reloading of i18n, to reset configuration
-      var i18nPath = process.env.EXPRESS_COV ? 'i18n-cov' : 'i18n';
+      var i18nPath = 'i18n';
       var i18nFilename = path.resolve(i18nPath + '.js');
       delete require.cache[i18nFilename];
       i18n = require( i18nFilename );
@@ -67,7 +67,7 @@ describe('Fallbacks', function () {
   describe('Fallback to locale', function () {
     beforeEach(function () {
       // Force reloading of i18n, to reset configuration
-      var i18nPath = process.env.EXPRESS_COV ? 'i18n-cov' : 'i18n';
+      var i18nPath = 'i18n';
       var i18nFilename = path.resolve(i18nPath + '.js');
       delete require.cache[i18nFilename];
       i18n = require( i18nFilename );
@@ -102,7 +102,7 @@ describe('Fallbacks', function () {
   describe('Keep valid locale', function () {
     beforeEach(function () {
       // Force reloading of i18n, to reset configuration
-      var i18nPath = process.env.EXPRESS_COV ? 'i18n-cov' : 'i18n';
+      var i18nPath = 'i18n';
       var i18nFilename = path.resolve(i18nPath + '.js');
       delete require.cache[i18nFilename];
       i18n = require( i18nFilename );

diff --git a/test/i18n.objectnotation.js b/test/i18n.objectnotation.js
@@ -1,7 +1,7 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
 // now with coverage suport
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
   should = require("should");
 
 describe('Object Notation', function () {
@@ -48,7 +48,7 @@ describe('Object Notation', function () {
       should.equal(singular, '1 Katze');
       should.equal(plural, '3 Katzen');
     });
-    
+
     it('should allow for simple pluralization', function(){
       var singular = __n("nested.deep.plural", 1);
       var plural = __n("nested.deep.plural", 3);

diff --git a/test/i18n.setLocale.js b/test/i18n.setLocale.js
@@ -1,7 +1,7 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
 // now with coverage suport
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
   should = require("should"),
   path = require("path");
 
@@ -13,7 +13,7 @@ describe('Locale switching should work on req and res', function() {
   beforeEach(function() {
 
     // Force reloading of i18n, to reset configuration
-    var i18nPath = process.env.EXPRESS_COV ? 'i18n-cov' : 'i18n';
+    var i18nPath = 'i18n';
     var i18nFilename = path.resolve(i18nPath + '.js');
     delete require.cache[i18nFilename];
     i18n = require(i18nFilename);

diff --git a/test/i18n.setLocaleDefaultLanguage.js b/test/i18n.setLocaleDefaultLanguage.js
@@ -8,7 +8,7 @@
  */
 
 // now with coverage suport
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
   should = require("should"),
   path = require("path");
 
@@ -20,7 +20,7 @@ describe('Locale switching should not modify defaultLocale on unsupported langua
   beforeEach(function() {
 
     // Force reloading of i18n, to reset configuration
-    var i18nPath = process.env.EXPRESS_COV ? 'i18n-cov' : 'i18n';
+    var i18nPath = 'i18n';
     var i18nFilename = path.resolve(i18nPath + '.js');
     delete require.cache[i18nFilename];
     i18n = require(i18nFilename);

diff --git a/test/i18n.setup.js b/test/i18n.setup.js
@@ -1,6 +1,6 @@
 /*jslint nomen: true, undef: true, sloppy: true, white: true, stupid: true, passfail: false, node: true, plusplus: true, indent: 2 */
 
-var i18n = process.env.EXPRESS_COV ? require('../i18n-cov') : require('../i18n'),
+var i18n = require('../i18n'),
     should = require("should");
 
 i18n.configure({