Skip to content

Commit b04742d

Browse files
committed
test: merge integration and unit tests
1 parent 0988a36 commit b04742d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+4
-20
lines changed

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
"lint:docs": "eslint --ext js,vue,md docs --ignore-path .gitignore",
1818
"lint:fix": "npm run lint -- --fix",
1919
"setup": "node build/install-hooks.js",
20-
"test": "npm run lint && npm run lint:docs && npm run flow && npm run test:types && npm run test:unit && npm run test:integration && npm run test:integration:karma",
21-
"test:integration": "cross-env BABEL_ENV=test mocha-webpack --webpack-config build/webpack.test.config.js test/integration/specs --recursive --require test/integration/setup/mocha.setup.js",
22-
"test:integration:karma": "cross-env BABEL_ENV=test TARGET=browser karma start test/integration/setup/karma.conf.js --single-run",
20+
"test": "npm run lint && npm run lint:docs && npm run flow && npm run test:types && npm run test:unit && npm run test:unit:karma",
2321
"test:unit": "cross-env BABEL_ENV=test mocha-webpack --webpack-config build/webpack.test.config.js test/unit/specs --recursive --require test/unit/setup/mocha.setup.js",
22+
"test:unit:karma": "cross-env BABEL_ENV=test TARGET=browser karma start test/unit/setup/karma.conf.js --single-run",
2423
"test:types": "tsc -p types",
2524
"release": "bash build/release.sh",
2625
"release:note": "node build/gen-release-note.js"

test/integration/.eslintrc

Lines changed: 0 additions & 10 deletions
This file was deleted.

test/integration/setup/mocha.setup.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/integration/setup/karma.conf.js renamed to test/unit/setup/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const webpackConfig = require('./../../../build/webpack.test.config.js')
1+
const webpackConfig = require('../../../build/webpack.test.config.js')
22

33
module.exports = function (config) {
44
config.set({

test/unit/setup/mocha.setup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const chai = require('chai')
22
const sinon = require('sinon')
3+
require('jsdom-global')()
34

45
global.expect = chai.expect
56
global.sinon = sinon
File renamed without changes.

0 commit comments

Comments
 (0)