feat: use browser-do, add mocha support

3cp · 3cp · commit d332318bebd8 · 2019-06-18T15:12:00.000+10:00
diff --git a/aurelia/test__if_jasmine_or_tape_or_mocha/setup.ext b/aurelia/test__if_jasmine_or_tape_or_mocha/setup.ext
diff --git a/aurelia/test__if_mocha/app.spec.ext b/aurelia/test__if_mocha/app.spec.ext
@@ -0,0 +1,32 @@
+import {expect} from 'chai';
+import {StageComponent} from 'aurelia-testing';
+import {bootstrap} from 'aurelia-bootstrapper';
+
+describe('Component app', () => {
+  let component;
+  let model = {};
+
+  beforeEach(() => {
+    component = StageComponent
+      .withResources('app')
+      .inView('<app></app>')
+      .boundTo(model);
+  });
+
+  afterEach(() => {
+    if (component) {
+      component.dispose();
+      component = null;
+    }
+  });
+
+  it('should render message', done => {
+    component.create(bootstrap).then(() => {
+      const view = component.element;
+      expect(view.textContent.trim()).to.be('Hello Aurelia!');
+      done();
+    }).catch(e => {
+      done(e);
+    });
+  });
+});
diff --git a/common/.eslintrc.json__if_babel b/common/.eslintrc.json__if_babel
@@ -42,6 +42,9 @@
     // @if jasmine
     "jasmine": true,
     // @endif
+    // @if mocha
+    "mocha": true,
+    // @endif
     // @if jest
     "jest": true,
     // @endif
diff --git a/common/README.md b/common/README.md
@@ -3,70 +3,60 @@
 An app using dumber bundler to build. More details in `tasks/*.js` (loaded by `gulpfile.js`).
 
 ## Run in dev mode, plus watch
-```
-npm start
-```
+
+    npm start
 
 ## Run in production mode, plus watch
 
 It updates index.html with hashed file name.
-```
-npm run start:prod
-```
+
+    npm run start:prod
+
 
 ## Build in dev mode
 
 Generates `scripts/*-bundle.js`
-```
-npm run build:dev
-```
+
+    npm run build:dev
+
 
 ## Build in production mode
 
 Generates `scripts/*-bundle.[hash].js`, update index.html with hashed file name.
-```
-npm run build
-```
+
+    npm run build
+
 
 ## To clear cache
 
 Clear tracing cache by dumber/* @if babel */, and transpiling cache by gulp-cache/* @endif */.
-```
-npm run clear-cache
-```
+
+    npm run clear-cache
+
 // @if babel
 If you touch `.babelrc` file, you'd better do clear cache.
 // @endif
 
 // @if jest || ava
 ## Nodejs test
-```
-npm test
-```
+
+    npm test
 
 Details in package.json -> scripts -> pretest & test.
 // @endif
-// @if jasmine || tape
+// @if jasmine || tape || mocha
 ## Headless browser (electron) test
-```
-npm test
-```
+
+    npm test
 
 Details in package.json -> scripts -> pretest & test.
 
-1. no karma, no hacking, just browser-run (tape-run wraps browser-run).
+1. no karma, no hacking, just [browser-do](https://github.com/3cp/browser-do).
 2. note `| tap-dot` is optional, `tap-dot` is just a tap result formatter to please the eyes.
-// @if jasmine
-3. uses jasmine tap reporter so we can pipe the result to tape-run to return proper return-code to terminal.
-// @endif
-
-Read more in `tasks/build.js`.
 
 ## Visible browser (chrome) test
-```
-npm run browser-test
-```
-// @if jasmine
-Note in visible browser test, we are feeding browser-run with SpecRunner.html instead of entry-bundle.js because we need jasmine css (in SpecRunner.html) for proper rendering.
-// @endif
+
+    npm run browser-test
+
+This runs in Chrome, if you want to use other browser, update package.json "browser-test" script. Read [browser-do](https://github.com/3cp/browser-do) for available browsers.
 // @endif
diff --git a/common/package.json b/common/package.json
@@ -36,9 +36,9 @@
     "lesshint": "^6.3.6",
     // @endif
 
-    // @if jasmine || tape
+    // @if jasmine || tape || mocha
     "tap-dot": "^2.0.0",
-    "tape-run": "^5.0.0",
+    "browser-do": "^0.1.0",
     // @endif
 
     // @if !sfc
@@ -79,10 +79,9 @@
     // @endif
     "lint": "npm run js-lint/* @if sass || less */ && npm run css-lint/* @endif *//* @if aurelia */ && npm run html-lint/* @endif */",
 
-    // @if jasmine || tape
+    // @if jasmine || tape || mocha
     "pretest": "npm run lint && npm run build:test",
     "build:test": "gulp clean && cross-env NODE_ENV=test gulp build",
-    "test": "tape-run < dist/entry-bundle.js | tap-dot",
     // @endif
     "start": "gulp",
     "start:prod": "cross-env NODE_ENV=production gulp",
diff --git a/common/tasks/_dumber.js b/common/tasks/_dumber.js
@@ -32,26 +32,14 @@ module.exports = dumber({
 
   // prepend before amd loader.
   // dumber-module-loader is injected automatically by dumber bundler after prepends.
-  // @if jasmine
-  // Here we load all jasmine stuff in global name space in test mode.
-  // @endif
   prepend: [
-    // @if jasmine
-    isTest && "node_modules/jasmine-core/lib/jasmine-core/jasmine.js",
-    isTest && "node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js",
-    isTest && "node_modules/jasmine-core/lib/jasmine-core/boot.js",
-    isTest && "node_modules/jasmine-reporters/src/tap_reporter.js",
-    // Turn on tap reporter (from jasmine-reporters), so results can be piped to tape-run.
-    // Note prepend accepts direct JavaScript content.
-    isTest && "jasmine.getEnv().addReporter(new jasmineReporters.TapReporter());",
-    // @endif
     // Promise polyfill for IE
     "node_modules/promise-polyfill/dist/polyfill.min.js"
   ],
 
   // append after amd loader and all module definitions in entry bundle.
   append: [
-    // @if jasmine || tape
+    // @if jasmine || tape || mocha
     // Kick off all test files.
     // Note dumber-module-loader requirejs call accepts regex which loads all matched module ids!
     // Note all module ids are relative to dumber option "src" (default to 'src') folder.
diff --git a/common/tasks/build.js__if_not_sfc b/common/tasks/build.js__if_not_sfc
@@ -99,18 +99,18 @@ function build() {
     // @endif
     // @if babel
     // @if !react
-    buildJs(/* @if jasmine || tape */isTest ? ['src/**/*.js', 'test/**/*.js'] : /* @endif */'src/**/*.js'),
+    buildJs(/* @if jasmine || tape || mocha */isTest ? ['src/**/*.js', 'test/**/*.js'] : /* @endif */'src/**/*.js'),
     // @endif
     // @if react
-    buildJs(/* @if jasmine || tape */isTest ? ['src/**/*.js{,x}', 'test/**/*.js{,x}'] : /* @endif */'src/**/*.js{,x}'),
+    buildJs(/* @if jasmine || tape || mocha */isTest ? ['src/**/*.js{,x}', 'test/**/*.js{,x}'] : /* @endif */'src/**/*.js{,x}'),
     // @endif
     // @endif
     // @if typescript
     // @if !react
-    buildJs(/* @if jasmine || tape */isTest ? ['src/**/*.ts', 'test/**/*.ts'] : /* @endif */'src/**/*.ts'),
+    buildJs(/* @if jasmine || tape || mocha */isTest ? ['src/**/*.ts', 'test/**/*.ts'] : /* @endif */'src/**/*.ts'),
     // @endif
     // @if react
-    buildJs(/* @if jasmine || tape */isTest ? ['src/**/*.ts{,x}', 'test/**/*.ts{,x}'] : /* @endif */'src/**/*.ts{,x}'),
+    buildJs(/* @if jasmine || tape || mocha */isTest ? ['src/**/*.ts{,x}', 'test/**/*.ts{,x}'] : /* @endif */'src/**/*.ts{,x}'),
     // @endif
     // @endif
     // @if css
diff --git a/common/tasks/build.js__if_sfc b/common/tasks/build.js__if_sfc
@@ -39,7 +39,7 @@ function build() {
   // dumber knows nothing about .ts/.less/.scss/.md files,
   // gulp-* plugins transpiled them into js/css/html before
   // sending to dumber.
-  return gulp.src(/* @if jasmine || tape */isTest ? ['test/**/*.js', 'src/**/*.{json,js,vue}'] : /* @endif */'src/**/*.{json,js,vue}', {sourcemaps: !isProduction, since: gulp.lastRun(build)})
+  return gulp.src(/* @if jasmine || tape || mocha */isTest ? ['test/**/*.js', 'src/**/*.{json,js,vue}'] : /* @endif */'src/**/*.{json,js,vue}', {sourcemaps: !isProduction, since: gulp.lastRun(build)})
   // plumber does continue on failure for dev mode
   .pipe(gulpif(!isProduction, plumber()))
   .pipe(compileVue)
diff --git a/jasmine/package.json b/jasmine/package.json
@@ -1,12 +1,12 @@
 {
   "devDependencies": {
     "jasmine-core": "^3.4.0",
-    "jasmine-reporters": "^2.3.2",
     // @if typescript
     "@types/jasmine": "^3.3.12",
     // @endif
   },
   "scripts": {
-    "browser-test": "npm run build:test && browser-run --input html --static . --browser chrome < SpecRunner.html"
+    "test": "browser-do --jasmine < dist/entry-bundle.js | tap-dot",
+    "browser-test": "npm run build:test && browser-do --jasmine --browser chrome < dist/entry-bundle.js"
   }
 }
diff --git a/mocha/package.json b/mocha/package.json
@@ -0,0 +1,13 @@
+{
+  "devDependencies": {
+    "mocha": "^6.1.4",
+    "chai": "^4.2.0",
+    // @if typescript
+    "@types/mocha": "^5.2.7",
+    // @endif
+  },
+  "scripts": {
+    "test": "browser-do --mocha < dist/entry-bundle.js | tap-dot",
+    "browser-test": "npm run build:test && browser-do --mocha --browser chrome < dist/entry-bundle.js"
+  }
+}
diff --git a/questions.js b/questions.js
@@ -37,6 +37,7 @@ module.exports = [
       {if: '!aurelia', value: 'jest', title: 'Jest', hint: 'Runs in Node.js, simulates browser, with a focus on simplicity.'},
       {if: 'aurelia',  value: 'jest', title: 'Jest', hint: 'Runs in Node.js, simulates browser (aurelia-pal-nodejs), with a focus on simplicity.'},
       {value: 'jasmine', title: 'Jasmine', hint: 'Runs in browser, a behavior-driven testing framework.'},
+      {value: 'mocha', title: 'Mocha + Chai', hint: 'Runs in browser, a feature-rich JavaScript test framework for node and browsers.'},
       {value: 'tape', title: 'Tape', hint: 'Runs in browser, tap-producing test harness for node and browsers.'},
 
       // Disable ava for now, there is one small issue I got no solution so far.
diff --git a/react/test__if_mocha/App.spec.extx b/react/test__if_mocha/App.spec.extx
@@ -0,0 +1,17 @@
+/* eslint react/jsx-key: 0 */
+import React from 'react';
+import {expect} from 'chai';
+import App from '../src/App';
+import ShallowRenderer from 'react-test-renderer/shallow';
+
+describe('Component App', () => {
+  it('should render message', () => {
+    const renderer = new ShallowRenderer();
+    renderer.render(<App />);
+    let result = renderer.getRenderOutput();
+    expect(result.type).to.be('div');
+    expect(result.props.children).to.deep.equal(
+      <h1>Hello React!</h1>
+    );
+  });
+});
diff --git a/tape/package.json b/tape/package.json
@@ -6,8 +6,7 @@
     // @endif
   },
   "scripts": {
-    // @if tape
-    "browser-test": "npm run build:test && browser-run --browser chrome < dist/entry-bundle.js"
-    // @endif
+    "test": "browser-do --tap < dist/entry-bundle.js | tap-dot",
+    "browser-test": "npm run build:test && browser-do --tap --browser chrome < dist/entry-bundle.js"
   }
 }
diff --git a/vue/test__if_mocha/App.spec.ext b/vue/test__if_mocha/App.spec.ext
@@ -0,0 +1,10 @@
+import {expect} from 'chai';
+import {mount} from '@vue/test-utils';
+import App from '../src/App';
+
+describe('Component App', () => {
+  it('should render message', () => {
+    const wrapper = mount(App);
+    expect(wrapper.text()).to.be('Hello Vue!');
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"devDependencies": {`
`3`	`3`	`"jasmine-core": "^3.4.0",`
`4`		`- "jasmine-reporters": "^2.3.2",`
`5`	`4`	`// @if typescript`
`6`	`5`	`"@types/jasmine": "^3.3.12",`
`7`	`6`	`// @endif`
`8`	`7`	`},`
`9`	`8`	`"scripts": {`
`10`		`- "browser-test": "npm run build:test && browser-run --input html --static . --browser chrome < SpecRunner.html"`
	`9`	`+ "test": "browser-do --jasmine < dist/entry-bundle.js \| tap-dot",`
	`10`	`+ "browser-test": "npm run build:test && browser-do --jasmine --browser chrome < dist/entry-bundle.js"`
`11`	`11`	`}`
`12`	`12`	`}`