refine tests

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 artifacts
-coverage
+coverage*
+.DS_Store

README.md

@@ -23,7 +23,7 @@ Install
 -------
 
 ```
-npm install gulp-jsx-coverage mocha --save-dev
+npm install gulp-jsx-coverage --save-dev
 ```
 
 Best Practices
@@ -40,7 +40,8 @@ Usage: General Mocha Test Creator
 ```javascript
 gulp.task('your_task_name', require('gulp-jsx-coverage').createTask({
  src: ['test/**/*.js', 'test/components/*.jsx'], // will pass to gulp.src as mocha tests
- istanbul: { // will pass to istanbul
+
+ istanbul: { // will pass to istanbul, this is default setting
  exclude: /node_modules|test[0-9]/ // do not instrument these files
  },
 

gulpfile.js

@@ -2,16 +2,8 @@
 require('gulp').task('mocha_tests', require('./index').createTask({
  src: ['test/test1.js', 'test/test2.jsx'],
  istanbul: {
- preserveComments: true,
  exclude: /node_modules|test[0-9]/
  },
- transpile: {
- babel: {
- include: /\.jsx?$/,
- exclude: /node_modules/,
- omitExt: ['.jsx']
- }
- },
  coverage: {
  reporters: ['text', 'json', 'lcov'],
  directory: 'coverage'
@@ -25,45 +17,44 @@ require('gulp').task('mocha_tests', require('./index').createTask({
 var gulp = require('gulp');
 var jasmine = require('gulp-jasmine');
 var GJC = require('./index');
-var GJCoptions = {
+
+gulp.task('mocha_emitext_tests', GJC.createTask({
+ src: ['test/test3.jsx'],
  istanbul: {
  exclude: /node_modules|test[0-9]/
  },
- transpile: {
- babel: {
- include: /\.jsx?$/,
- exclude: /node_modules/
- }
+ babel: {
+ include: /\.jsx$/,
+ omitExt: ['.jsx']
  },
  coverage: {
- reporters: ['text', 'json', 'lcov'],
- directory: 'coverage'
+ reporters: ['text', 'lcov'],
+ directory: 'coverage2'
  }
-};
-
-gulp.task('mocha_emitext_tests', GJC.createTask(Object.assign({}, GJCoptions, {
- src: ['test/test8.cjsx'],
- transpile: {
- cjsx: {
- include: /\.cjsx$/,
- omitExt: ['.cjsx']
- }
- },
-})));
+}));
 
-gulp.task('mocha_cover_all_tests', GJC.createTask(Object.assign({}, GJCoptions, {
- src: ['test/Component.jsx', 'test/target.js', 'test/test1.js'],
-})));
+gulp.task('mocha_cover_all_tests', GJC.createTask({
+ src: ['test/*', '!test/test3.jsx', '!test/test2.jsx'],
+ coverage: {
+ reporters: ['text', 'lcov'],
+ directory: 'coverage3'
+ }
+}));
 
 gulp.task('jasmine_tests', function () {
- GJC.initModuleLoader(GJCoptions);
+ GJC.initModuleLoader({});
 
  return gulp.src(['test/test4.js', 'test/test5.jsx'])
  .pipe(jasmine())
- .on('end', GJC.collectIstanbulCoverage(GJCoptions));
+ .on('end', GJC.collectIstanbulCoverage({
+ coverage: {
+ reporters: ['text', 'lcov'],
+ directory: 'coverage4'
+ }
+ }));
 });
 
-gulp.task('mocha_threshold_tests', GJC.createTask(Object.assign({}, GJCoptions, {
+gulp.task('mocha_threshold_tests', GJC.createTask({
  src: ['test/test1.js'],
  threshold: [
  {
@@ -75,4 +66,4 @@ gulp.task('mocha_threshold_tests', GJC.createTask(Object.assign({}, GJCoptions,
  min: 90
  }
  ]
-})));
+}));

index.js

@@ -21,20 +21,29 @@ var initModuleLoader = function (options) {
  exclude: /node_modules/,
  omitExt: false
  }, options.babel);
+ var istanbulCfg = Object.assign({
+ exclude: /node_modules/
+ }, options.istanbul);
  var moduleLoader = function (module, filename) {
- var srcCache = sourceCache[filename],
- src = srcCache || fs.readFileSync(filename, {encoding: 'utf8'}),
- tmp;
+ var srcCache = sourceCache[filename];
+ var src = srcCache || fs.readFileSync(filename, {encoding: 'utf8'});
+ var bbl;
+ var cov;
+ var tmp;
 
  if (srcCache) {
  return;
  }
 
- if (filename.match(babelFiles.include) && !filename.match(babelFiles.exclude)) {
+ bbl = (filename.match(babelFiles.include) && !filename.match(babelFiles.exclude));
+ cov = !filename.match(istanbulCfg.exclude);
+
+ if (bbl || cov) {
  try {
  tmp = babel.transform(src, Object.assign({
- filename: filename
- }, filename.match(options.istanbul.exclude) ? {} : {plugins: [['istanbul', {include: '*', exclude: '/_NOT_ME_'}]]}));
+ filename: filename,
+ babelrc: bbl
+ }, cov ? {plugins: [['istanbul', {include: '*', exclude: '/_NOT_ME_'}]]} : {}));
  srcCache = tmp.map || 1;
  src = tmp.code;
  } catch (e) {

package.json

@@ -40,8 +40,6 @@
  "main": "index.js",
  "dependencies": {
  "babel-core": "^6.22.1",
- "gulp": "^3.9.1",
- "gulp-mocha": "^3.0.1",
  "gulp-util": "^3.0.8",
  "istanbul-lib-coverage": "^1.0.1",
  "istanbul-lib-report": "^1.0.0-alpha.3",
@@ -57,6 +55,8 @@
  "coffee-script": "1.12.3",
  "eslint": "3.14.1",
  "eslint-plugin-react": "6.9.0",
+ "gulp": "^3.9.1",
+ "gulp-mocha": "^3.0.1",
  "gulp-jasmine": "2.4.2",
  "jsdom": "9.9.1",
  "mocha": "3.2.0",

test/test3.jsx

@@ -0,0 +1,15 @@
+'use strict';
+
+var React = require('react');
+var ReactDOM = require('react-dom');
+var assert = require('assert');
+var target = require('./target');
+var Component = require('./Component');
+var Testlib = require('./testlib');
+
+describe('Component.jsx (tested by test3.jsx)', function () {
+ it('should render Hello World', function() {
+ var node = Testlib.renderComponent(Component);
+ assert.equal('Hello World', ReactDOM.findDOMNode(node).innerHTML);
+ });
+});