From 39cb9bde06f7aab1a735cd2531a5953aabc7cd71 Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Fri, 1 Mar 2019 17:38:26 +0100 Subject: [PATCH] chore(cr): move tests into --- test/config-generator.js | 26 ++++++++++++++++++++++++++ test/loaders/eslint.js | 27 --------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/test/config-generator.js b/test/config-generator.js index 214d1a14..67c77fbe 100644 --- a/test/config-generator.js +++ b/test/config-generator.js @@ -1014,4 +1014,30 @@ describe('The config-generator function', () => { }); }); }); + + describe('Test configureLoaderRule()', () => { + it('configure rule for "eslint"', () => { + const config = createConfig(); + config.setPublicPath('/'); + config.enableEslintLoader(); + config.configureLoaderRule('eslint', (loader) => { + loader.test = /\.(jsx?|vue)/; + }); + + const webpackConfig = configGenerator(config); + const eslintLoader = webpackConfig.module.rules.find(rule => rule.loader === 'eslint-loader'); + + expect(eslintLoader).to.deep.equals({ + test: /\.(jsx?|vue)/, + enforce: 'pre', + exclude: /node_modules/, + loader: 'eslint-loader', + options: { + cache: true, + emitWarning: true, + parser: 'babel-eslint' + } + }); + }); + }); }); diff --git a/test/loaders/eslint.js b/test/loaders/eslint.js index 77957ede..1160e326 100644 --- a/test/loaders/eslint.js +++ b/test/loaders/eslint.js @@ -12,9 +12,7 @@ const expect = require('chai').expect; const WebpackConfig = require('../../lib/WebpackConfig'); const RuntimeConfig = require('../../lib/config/RuntimeConfig'); -const configGenerator = require('../../lib/config-generator'); const eslintLoader = require('../../lib/loaders/eslint'); -const isWindows = (process.platform === 'win32'); function createConfig() { const runtimeConfig = new RuntimeConfig(); @@ -79,29 +77,4 @@ describe('loaders/eslint', () => { const actualOptions = eslintLoader.getOptions(config); expect(actualOptions).to.deep.equals({ foo: true }); }); - - it('configure ESLint loader rule', () => { - const config = createConfig(); - config.outputPath = isWindows ? 'C:\\tmp\\public' : '/tmp/public'; - config.setPublicPath('/'); - config.enableEslintLoader(); - config.configureLoaderRule('eslint', (loader) => { - loader.test = /\.(jsx?|vue)/; - }); - - const webpackConfig = configGenerator(config); - const eslintLoader = webpackConfig.module.rules.find(rule => rule.loader === 'eslint-loader'); - - expect(eslintLoader).to.deep.equals({ - test: /\.(jsx?|vue)/, - enforce: 'pre', - exclude: /node_modules/, - loader: 'eslint-loader', - options: { - cache: true, - emitWarning: true, - parser: 'babel-eslint' - } - }); - }); });