Skip to content

Commit 6ee7aaa

Browse files
paulpflugyyx990803
paulpflug
authored and
yyx990803
committed
cleanup tests by using expose loader (#225)
1 parent 4f75a13 commit 6ee7aaa

File tree

11 files changed

+19
-27
lines changed

11 files changed

+19
-27
lines changed

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,15 @@
5757
"babel-core": "^6.8.0",
5858
"babel-loader": "^6.2.4",
5959
"babel-plugin-transform-runtime": "^6.8.0",
60-
"babel-runtime": "^6.0.0",
6160
"babel-preset-es2015": "^6.6.0",
61+
"babel-runtime": "^6.0.0",
6262
"chai": "^3.0.0",
6363
"coffee-loader": "^0.7.2",
6464
"coffee-script": "^1.10.0",
6565
"css-loader": "^0.23.1",
6666
"eslint": "^2.9.0",
6767
"eslint-config-vue": "^1.0.0",
68+
"expose-loader": "^0.7.1",
6869
"extract-text-webpack-plugin": "^1.0.1",
6970
"file-loader": "^0.8.5",
7071
"inject-loader": "^2.0.1",

‎test/fixtures/autoprefix.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/basic.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/extract-css.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/media-query.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/pre.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/resolve.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/scoped-css.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/script-import-entry.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/template-import.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/test.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('vue-loader', function () {
1212

1313
var testHTML = '<!DOCTYPE html><html><head></head><body></body></html>'
1414
var outputDir = path.resolve(__dirname, './output')
15-
var loaderPath = path.resolve(__dirname, '../')
15+
var loaderPath = 'expose?vueModule!'+path.resolve(__dirname, '../')
1616
var globalConfig = {
1717
output: {
1818
path: outputDir,
@@ -66,9 +66,9 @@ describe('vue-loader', function () {
6666

6767
it('basic', function (done) {
6868
test({
69-
entry: './test/fixtures/basic.js'
69+
entry: './test/fixtures/basic.vue'
7070
}, function (window) {
71-
var module = window.testModule
71+
var module = window.vueModule
7272
expect(module.template).to.contain('<h2 class="red">{{msg}}</h2>')
7373
expect(module.data().msg).to.contain('Hello from Component A!')
7474
var style = window.document.querySelector('style').textContent
@@ -79,9 +79,9 @@ describe('vue-loader', function () {
7979

8080
it('pre-processors', function (done) {
8181
test({
82-
entry: './test/fixtures/pre.js'
82+
entry: './test/fixtures/pre.vue'
8383
}, function (window) {
84-
var module = window.testModule
84+
var module = window.vueModule
8585
expect(module.template).to.contain(
8686
'<h1>This is the app</h1>' +
8787
'<comp-a></comp-a>' +
@@ -96,9 +96,9 @@ describe('vue-loader', function () {
9696

9797
it('scoped style', function (done) {
9898
test({
99-
entry: './test/fixtures/scoped-css.js'
99+
entry: './test/fixtures/scoped-css.vue'
100100
}, function (window) {
101-
var module = window.testModule
101+
var module = window.vueModule
102102
var id = '_v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
103103
expect(module.template).to.contain(
104104
'<div ' + id + '=""><h1 ' + id + '="">hi</h1></div>\n' +
@@ -129,27 +129,27 @@ describe('vue-loader', function () {
129129

130130
it('template import', function (done) {
131131
test({
132-
entry: './test/fixtures/template-import.js'
132+
entry: './test/fixtures/template-import.vue'
133133
}, function (window) {
134-
var module = window.testModule
134+
var module = window.vueModule
135135
expect(module.template).to.contain('<div><h1>hello</h1></div>')
136136
done()
137137
})
138138
})
139139

140140
it('script import', function (done) {
141141
test({
142-
entry: './test/fixtures/script-import-entry.js'
142+
entry: './test/fixtures/script-import.vue'
143143
}, function (window) {
144-
var module = window.testModule
144+
var module = window.vueModule
145145
expect(module.data().msg).to.contain('Hello from Component A!')
146146
done()
147147
})
148148
})
149149

150150
it('source map', function (done) {
151151
var config = Object.assign({}, globalConfig, {
152-
entry: './test/fixtures/basic.js',
152+
entry: './test/fixtures/basic.vue',
153153
devtool: 'source-map'
154154
})
155155
webpack(config, function (err) {
@@ -181,7 +181,7 @@ describe('vue-loader', function () {
181181

182182
it('autoprefix', function (done) {
183183
test({
184-
entry: './test/fixtures/autoprefix.js'
184+
entry: './test/fixtures/autoprefix.vue'
185185
}, function (window) {
186186
var style = window.document.querySelector('style').textContent
187187
expect(style).to.contain('body {\n -webkit-transform: scale(1);\n transform: scale(1);\n}')
@@ -191,7 +191,7 @@ describe('vue-loader', function () {
191191

192192
it('media-query', function (done) {
193193
test({
194-
entry: './test/fixtures/media-query.js'
194+
entry: './test/fixtures/media-query.vue'
195195
}, function (window) {
196196
var style = window.document.querySelector('style').textContent
197197
var id = '_v-' + hash(require.resolve('./fixtures/media-query.vue'))
@@ -202,7 +202,7 @@ describe('vue-loader', function () {
202202

203203
it('extract CSS', function (done) {
204204
webpack(Object.assign({}, globalConfig, {
205-
entry: './test/fixtures/extract-css.js',
205+
entry: './test/fixtures/extract-css.vue',
206206
vue: {
207207
loaders: {
208208
css: ExtractTextPlugin.extract('css'),
@@ -238,7 +238,7 @@ describe('vue-loader', function () {
238238

239239
it('translates relative URLs and respects resolve alias', function (done) {
240240
test({
241-
entry: './test/fixtures/resolve.js',
241+
entry: './test/fixtures/resolve.vue',
242242
resolve: {
243243
alias: {
244244
fixtures: path.resolve(__dirname, 'fixtures')
@@ -251,7 +251,7 @@ describe('vue-loader', function () {
251251
]
252252
}
253253
}, function (window) {
254-
var module = window.testModule
254+
var module = window.vueModule
255255
expect(module.template).to.contain('<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
256256
var style = window.document.querySelector('style').textContent
257257
expect(style).to.contain('html { background-image: url(logo.c9e00e.png); }')

0 commit comments

Comments
 (0)