test: fix tests

yyx990803 · yyx990803 · commit e6b72789e738 · 2018-01-25T19:32:11.000-05:00
diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginBabel.spec.js b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginBabel.spec.js
@@ -14,10 +14,10 @@ test('using correct loader', () => {
 
   const config = service.resolveWebpackConfig()
   const rule = config.module.rules.find(rule => rule.test.test('foo.ts'))
-  expect(rule.use[0].loader).toBe('cache-loader')
-  expect(rule.use[1].loader).toBe('babel-loader')
-  expect(rule.use[2].loader).toBe('cache-loader')
-  expect(rule.use[3].loader).toBe('ts-loader')
+  expect(rule.use[0].loader).toMatch('cache-loader')
+  expect(rule.use[1].loader).toMatch('babel-loader')
+  expect(rule.use[2].loader).toMatch('cache-loader')
+  expect(rule.use[3].loader).toMatch('ts-loader')
 })
 
 const creatorOptions = {
diff --git a/packages/@vue/cli-service/__tests__/css.spec.js b/packages/@vue/cli-service/__tests__/css.spec.js
@@ -31,7 +31,7 @@ const findLoaders = (config, lang) => {
 
 const findOptions = (config, lang, _loader) => {
   const rule = findRule(config, lang)
-  const use = rule.use.find(({ loader }) => `${_loader}-loader` === loader)
+  const use = rule.use.find(({ loader }) => loader.includes(`${_loader}-loader`))
   return use.options
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ const findLoaders = (config, lang) => {`
`31`	`31`
`32`	`32`	`const findOptions = (config, lang, _loader) => {`
`33`	`33`	`const rule = findRule(config, lang)`
`34`		- const use = rule.use.find(({ loader }) => `${_loader}-loader` === loader)
	`34`	+ const use = rule.use.find(({ loader }) => loader.includes(`${_loader}-loader`))
`35`	`35`	`return use.options`
`36`	`36`	`}`
`37`	`37`