Skip to content
This repository was archived by the owner on Jan 15, 2019. It is now read-only.

Commit 956a233

Browse files
lnhrdtlnhrdt
committed
Backfill test updates for Windows platform fix
1 parent 15c8eb7 commit 956a233

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎index.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const path = require('path')
2-
32
const cloneDeep = require('lodash.clonedeep')
43

54
const ruleChildren = (loader) => loader.use || loader.oneOf || Array.isArray(loader.loader) && loader.loader || []

‎index.test.js

+24-23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const path = require('path')
12
const subject = require('./index')
23

34
describe('CSS Modules rewire', () => {
@@ -9,40 +10,40 @@ describe('CSS Modules rewire', () => {
910
test: /\.(js|jsx|mjs)$/,
1011
enforce: 'pre',
1112
use: [
12-
{options: {}, loader: '/path/to/eslint-loader/index.js'}
13+
{options: {}, loader: path.resolve(__dirname, '/path/to/eslint-loader/index.js')}
1314
],
14-
include: '/path/to/src'
15+
include: path.resolve(__dirname, '/path/to/src')
1516
},
1617
{
1718
oneOf: [
1819
{
1920
test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
20-
loader: '/path/to/url-loader/index.js',
21+
loader: path.resolve(__dirname, '/path/to/url-loader/index.js'),
2122
options: {},
2223
},
2324
{
2425
test: /\.(js|jsx|mjs)$/,
25-
include: '/path/to/src',
26-
loader: '/path/to/babel-loader/lib/index.js',
26+
include: path.resolve(__dirname, '/path/to/src'),
27+
loader: path.resolve(__dirname, '/path/to/babel-loader/lib/index.js'),
2728
options: {},
2829
},
2930
{
3031
test: /\.css$/,
3132
use: [
32-
'/path/to/style-loader/index.js',
33+
path.resolve(__dirname, '/path/to/style-loader/index.js'),
3334
{
34-
loader: '/path/to/css-loader/index.js',
35+
loader: path.resolve(__dirname, '/path/to/css-loader/index.js'),
3536
options: {importLoaders: 1},
3637
},
3738
{
38-
loader: '/path/to/postcss-loader/lib/index.js',
39+
loader: path.resolve(__dirname, '/path/to/postcss-loader/lib/index.js'),
3940
options: {},
4041
},
4142
],
4243
},
4344
{
4445
exclude: [/\.js$/, /\.html$/, /\.json$/],
45-
loader: '/path/to/file-loader/dist/cjs.js',
46+
loader: path.resolve(__dirname, '/path/to/file-loader/dist/cjs.js'),
4647
options: {name: 'static/media/[name].[hash:8].[ext]'},
4748
},
4849
]
@@ -57,51 +58,51 @@ describe('CSS Modules rewire', () => {
5758
test: /\.(js|jsx|mjs)$/,
5859
enforce: 'pre',
5960
use: [
60-
{options: {}, loader: '/path/to/eslint-loader/index.js'}
61+
{options: {}, loader: path.resolve(__dirname, '/path/to/eslint-loader/index.js')}
6162
],
62-
include: '/path/to/src'
63+
include: path.resolve(__dirname, '/path/to/src')
6364
},
6465
{
6566
oneOf: [
6667
{
6768
test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
68-
loader: '/path/to/url-loader/index.js',
69+
loader: path.resolve(__dirname, '/path/to/url-loader/index.js'),
6970
options: {},
7071
},
7172
{
7273
test: /\.(js|jsx|mjs)$/,
73-
include: '/path/to/src',
74-
loader: '/path/to/babel-loader/lib/index.js',
74+
include: path.resolve(__dirname, '/path/to/src'),
75+
loader: path.resolve(__dirname, '/path/to/babel-loader/lib/index.js'),
7576
options: {},
7677
},
7778
{
7879
test: /\.css$/,
7980
loader: [
8081
{
81-
loader: '/path/to/extract-text-webpack-plugin/dist/loader.js',
82+
loader: path.resolve(__dirname, '/path/to/extract-text-webpack-plugin/dist/loader.js'),
8283
options: {}
8384
},
8485
{
85-
loader: '/path/to/style-loader/index.js',
86+
loader: path.resolve(__dirname, '/path/to/style-loader/index.js'),
8687
options: {}
8788
},
8889
{
89-
loader: '/path/to/css-loader/index.js',
90+
loader: path.resolve(__dirname, '/path/to/css-loader/index.js'),
9091
options: {
9192
importLoaders: 1,
9293
minimize: true,
9394
sourceMap: true
9495
}
9596
},
9697
{
97-
loader: '/path/to/postcss-loader/lib/index.js',
98+
loader: path.resolve(__dirname, '/path/to/postcss-loader/lib/index.js'),
9899
options: {}
99100
}
100101
]
101102
},
102103
{
103104
exclude: [/\.js$/, /\.html$/, /\.json$/],
104-
loader: '/path/to/file-loader/dist/cjs.js',
105+
loader: path.resolve(__dirname, '/path/to/file-loader/dist/cjs.js'),
105106
options: {name: 'static/media/[name].[hash:8].[ext]'},
106107
},
107108
]
@@ -185,7 +186,7 @@ describe('CSS Modules rewire', () => {
185186
expect(sassLoader.use.slice(0, 3)).toEqual(cssLoader.use)
186187
})
187188
it('should append the sass-loader', () => {
188-
expect(sassLoader.use[3]).toContain('/sass-loader/')
189+
expect(sassLoader.use[3]).toContain(`${path.sep}sass-loader${path.sep}`)
189190
})
190191
})
191192

@@ -197,7 +198,7 @@ describe('CSS Modules rewire', () => {
197198
expect(sassModulesLoader.use.slice(0, 3)).toEqual(cssModulesLoader.use)
198199
})
199200
it('should append the sass-loader', () => {
200-
expect(sassModulesLoader.use[3]).toContain('/sass-loader/')
201+
expect(sassModulesLoader.use[3]).toContain(`${path.sep}sass-loader${path.sep}`)
201202
})
202203
})
203204
})
@@ -218,7 +219,7 @@ describe('CSS Modules rewire', () => {
218219
expect(sassLoader.loader.slice(0, 4)).toEqual(cssLoader.loader)
219220
})
220221
it('should append the sass-loader', () => {
221-
expect(sassLoader.loader[4]).toContain('/sass-loader/')
222+
expect(sassLoader.loader[4]).toContain(`${path.sep}sass-loader${path.sep}`)
222223
})
223224
})
224225

@@ -232,7 +233,7 @@ describe('CSS Modules rewire', () => {
232233
})
233234

234235
it('should append the sass-loader', () => {
235-
expect(sassModulesLoader.loader[4]).toContain('/sass-loader/')
236+
expect(sassModulesLoader.loader[4]).toContain(`${path.sep}sass-loader${path.sep}`)
236237
})
237238
})
238239
})

0 commit comments

Comments
 (0)