Skip to content

Commit

Permalink
build: adjust test build setup for easier requires
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Dec 27, 2015
1 parent 599e38e commit f7a91fc
Show file tree
Hide file tree
Showing 57 changed files with 132 additions and 125 deletions.
16 changes: 5 additions & 11 deletions build/karma.base.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
var webpackConfig = require('./webpack.test.config')
delete webpackConfig.entry
delete webpackConfig.devtool

// shared config for all unit tests
module.exports = {
frameworks: ['jasmine'],
Expand All @@ -8,17 +12,7 @@ module.exports = {
preprocessors: {
'../test/unit/specs/index.js': ['webpack']
},
webpack: {
module: {
loaders: [
{
test: /\.js$/,
exclude: /test|node_modules/,
loader: 'babel?optional[]=runtime&loose=all'
}
]
}
},
webpack: webpackConfig,
webpackMiddleware: {
noInfo: true
},
Expand Down
3 changes: 2 additions & 1 deletion build/webpack.dev.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
var path = require('path')
var webpack = require('webpack')

module.exports = {
entry: './src/index',
output: {
path: './dist',
path: path.resolve(__dirname, '../dist'),
filename: 'vue.js',
library: 'Vue',
libraryTarget: 'umd'
Expand Down
20 changes: 16 additions & 4 deletions build/webpack.test.config.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
var path = require('path')
var webpack = require('webpack')

module.exports = {
entry: './test/unit/specs/index.js',
output: {
path: './test/unit',
path: path.resolve(__dirname, '../test/unit'),
filename: 'specs.js'
},
resolve: {
alias: {
src: path.resolve(__dirname, '../src')
}
},
module: {
loaders: [
{ test: /\.js$/, loader: 'babel', exclude: /test\/unit/ }
{
test: /\.js$/,
loader: 'babel',
exclude: /test\/unit|node_modules/
}
]
},
babel: {
loose: 'all'
loose: 'all',
optional: ['runtime']
},
plugins: [
new webpack.DefinePlugin({
Expand All @@ -22,7 +33,8 @@ module.exports = {
})
],
devServer: {
contentBase: './test/unit'
contentBase: './test/unit',
noInfo: true
},
devtool: '#source-map'
}
4 changes: 2 additions & 2 deletions test/unit/specs/api/data_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Vue = require('../../../../src/index')
var _ = require('../../../../src/util')
var Vue = require('src')
var _ = require('src/util')
var nextTick = _.nextTick

describe('Data API', function () {
Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/api/dom_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* those are tested in transition_spec.js.
*/

var Vue = require('../../../../src/index')
var _ = require('../../../../src/util')
var Vue = require('src')
var _ = require('src/util')

describe('DOM API', function () {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/api/events_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Vue = require('../../../../src/index')
var Vue = require('src')

describe('Events API', function () {

Expand Down
6 changes: 3 additions & 3 deletions test/unit/specs/api/global_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var Vue = require('../../../../src/index')
var _ = require('../../../../src/util')
var config = require('../../../../src/config')
var Vue = require('src')
var _ = require('src/util')
var config = require('src/config')

describe('Global API', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/api/lifecycle_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Vue = require('../../../../src/index')
var compiler = require('../../../../src/compiler')
var Vue = require('src')
var compiler = require('src/compiler')

describe('Lifecycle API', function () {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/async_component_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Vue = require('../../../src/index')
var Vue = require('src')
var _ = Vue.util

describe('Async components', function () {
Expand Down
6 changes: 3 additions & 3 deletions test/unit/specs/batcher_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var config = require('../../../src/config')
var batcher = require('../../../src/batcher')
var nextTick = require('../../../src/util').nextTick
var config = require('src/config')
var batcher = require('src/batcher')
var nextTick = require('src/util').nextTick

describe('Batcher', function () {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/cache_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Cache = require('../../../src/cache')
var Cache = require('src/cache')

/**
* Debug function to assert cache state
Expand Down
10 changes: 5 additions & 5 deletions test/unit/specs/compiler/compile_spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var Vue = require('../../../../src/index')
var _ = require('../../../../src/util')
var compiler = require('../../../../src/compiler')
var Vue = require('src')
var _ = require('src/util')
var compiler = require('src/compiler')
var compile = compiler.compile
var publicDirectives = require('../../../../src/directives/public')
var internalDirectives = require('../../../../src/directives/internal')
var publicDirectives = require('src/directives/public')
var internalDirectives = require('src/directives/internal')

describe('Compile', function () {

Expand Down
6 changes: 3 additions & 3 deletions test/unit/specs/compiler/transclude_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var transclude = require('../../../../src/compiler').transclude
var Vue = require('../../../../src/index')
var _ = require('../../../../src/util')
var transclude = require('src/compiler').transclude
var Vue = require('src')
var _ = require('src/util')

describe('Transclude', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directive_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Vue = require('../../../src/index')
var Directive = require('../../../src/directive')
var Vue = require('src')
var Directive = require('src/directive')
var nextTick = Vue.nextTick

describe('Directive', function () {
Expand Down
6 changes: 3 additions & 3 deletions test/unit/specs/directives/element/partial_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var Vue = require('../../../../../src/index')
var _ = require('../../../../../src/util')
var compiler = require('../../../../../src/compiler')
var Vue = require('src')
var _ = require('src/util')
var compiler = require('src/compiler')

describe('Partial', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/element/slot_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Vue = require('../../../../../src/index')
var _ = require('../../../../../src/util')
var Vue = require('src')
var _ = require('src/util')

describe('Slot Distribution', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/internal/class_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var def = require('../../../../../src/directives/internal/class')
var _ = require('src/util')
var def = require('src/directives/internal/class')

describe(':class', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/internal/component_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var Vue = require('../../../../../src/index')
var _ = require('src/util')
var Vue = require('src')

describe('Component', function () {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/directives/internal/prop_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Vue = require('../../../../../src/index')
var Vue = require('src')

describe('prop', function () {

Expand Down
6 changes: 3 additions & 3 deletions test/unit/specs/directives/internal/style_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var _ = require('../../../../../src/util')
var def = require('../../../../../src/directives/internal/style')
var Vue = require('../../../../../src/index')
var _ = require('src/util')
var def = require('src/directives/internal/style')
var Vue = require('src')

function checkPrefixedProp (prop) {
var el = document.createElement('div')
Expand Down
8 changes: 4 additions & 4 deletions test/unit/specs/directives/internal/transition_spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var _ = require('../../../../../src/util')
var Vue = require('../../../../../src/index')
var Directive = require('../../../../../src/directive')
var def = require('../../../../../src/directives/internal/transition')
var _ = require('src/util')
var Vue = require('src')
var Directive = require('src/directive')
var def = require('src/directives/internal/transition')

describe('transition', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/bind_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var def = require('../../../../../src/directives/public/bind')
var _ = require('src/util')
var def = require('src/directives/public/bind')
var xlinkNS = 'http://www.w3.org/1999/xlink'

describe('v-bind', function () {
Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/cloak_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var compile = require('../../../../../src/compiler').compile
var Vue = require('../../../../../src/index')
var compile = require('src/compiler').compile
var Vue = require('src')

describe('v-cloak', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/el_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var Vue = require('../../../../../src/index')
var _ = require('src/util')
var Vue = require('src')

describe('el', function () {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/directives/public/for/for_ref_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Vue = require('../../../../../../src/index')
var Vue = require('src')
var _ = Vue.util

describe('v-for + ref', function () {
Expand Down
6 changes: 3 additions & 3 deletions test/unit/specs/directives/public/for/for_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var _ = require('../../../../../../src/util')
var Vue = require('../../../../../../src/index')
var config = require('../../../../../../src/config')
var _ = require('src/util')
var Vue = require('src')
var config = require('src/config')

describe('v-for', function () {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/directives/public/for/for_stagger_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Vue = require('../../../../../../src/index')
var Vue = require('src')
var _ = Vue.util

describe('v-for staggering transitions', function () {
Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/html_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var def = require('../../../../../src/directives/public/html')
var _ = require('src/util')
var def = require('src/directives/public/html')

describe('v-html', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/if_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var Vue = require('../../../../../src/index')
var _ = require('src/util')
var Vue = require('src')

describe('v-if', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/model_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var Vue = require('../../../../../src/index')
var _ = require('src/util')
var Vue = require('src')

// unset jQuery to bypass jQuery check for normal test cases
jQuery = null
Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/on_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var Vue = require('../../../../../src/index')
var _ = require('src/util')
var Vue = require('src')

function trigger (target, event, process) {
var e = document.createEvent('HTMLEvents')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/directives/public/pre_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Vue = require('../../../../../src/index')
var Vue = require('src')

describe('v-pre', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/ref_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var Vue = require('../../../../../src/index')
var _ = require('src/util')
var Vue = require('src')

describe('ref', function () {

Expand Down
6 changes: 3 additions & 3 deletions test/unit/specs/directives/public/show_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var Vue = require('../../../../../src/index')
var transition = require('../../../../../src/transition')
var def = require('../../../../../src/directives/public/show')
var Vue = require('src')
var transition = require('src/transition')
var def = require('src/directives/public/show')

describe('v-show', function () {

Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/directives/public/text_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var _ = require('../../../../../src/util')
var def = require('../../../../../src/directives/public/text')
var _ = require('src/util')
var def = require('src/directives/public/text')

describe('v-text', function () {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/filters/filters_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var filters = require('../../../../src/filters')
var filters = require('src/filters')

describe('Filters', function () {

Expand Down
6 changes: 3 additions & 3 deletions test/unit/specs/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// set some global Vue options
var Vue = require('../../../src/index')
var Vue = require('src')
Vue.options.replace = false
Vue.config.silent = true

Expand All @@ -10,8 +10,8 @@ Vue.config.silent = true
* utility functions.
*/

var _ = require('../../../src/util')
var __ = require('../../../src/util/debug')
var _ = require('src/util')
var __ = require('src/util/debug')
var scope = typeof window === 'undefined'
? global
: window
Expand Down
4 changes: 2 additions & 2 deletions test/unit/specs/instance/events_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Vue = require('../../../../src/index')
var _ = require('../../../../src/util')
var Vue = require('src')
var _ = require('src/util')

describe('Instance Events', function () {

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/instance/init_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Vue = require('../../../../src/index')
var Vue = require('src')
var init = Vue.prototype._init

describe('Instance Init', function () {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/instance/misc_spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Vue = require('../../../../src/index')
var Vue = require('src')

describe('misc', function () {

Expand Down
Loading

0 comments on commit f7a91fc

Please sign in to comment.