From fb09faed3badf149ec9c38bb69c4edb2679d7bbf Mon Sep 17 00:00:00 2001 From: Ben Holloway Date: Wed, 9 Jun 2021 23:01:47 +1000 Subject: [PATCH 1/2] remove the engine option harder, ensure deprecation warning is tested --- packages/resolve-url-loader/index.js | 2 +- test/cases/misconfiguration.js | 30 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/packages/resolve-url-loader/index.js b/packages/resolve-url-loader/index.js index 0705f01..4738b9b 100644 --- a/packages/resolve-url-loader/index.js +++ b/packages/resolve-url-loader/index.js @@ -20,7 +20,7 @@ const logToTestHarness = require('./lib/log-to-test-harness'); const DEPRECATED_OPTIONS = { engine: [ 'DEP_RESOLVE_URL_LOADER_OPTION_ENGINE', - 'the "engine" option has been removed, "postcss" is the only available parser' + '"engine" option has been removed, postcss is the only parser used' ], keepQuery: [ 'DEP_RESOLVE_URL_LOADER_OPTION_KEEP_QUERY', diff --git a/test/cases/misconfiguration.js b/test/cases/misconfiguration.js index ceed3f4..c0821fa 100644 --- a/test/cases/misconfiguration.js +++ b/test/cases/misconfiguration.js @@ -53,6 +53,36 @@ module.exports = test( env({ ENTRY: join('src', 'index.scss') }), + testWithOption({ engine: 'postcss' })( + testDefault( + buildDevNormal( + assertWebpackOk, + assertNoErrors, + assertDeprecationWarning('"engine" option has been removed'), + assertContentDev + ), + buildProdNormal( + assertWebpackOk, + assertNoErrors, + assertDeprecationWarning('"engine" option has been removed'), + assertContentProd + ) + ), + testSilent( + buildDevNormal( + assertWebpackOk, + assertNoErrors, + assertSilence, + assertContentDev + ), + buildProdNormal( + assertWebpackOk, + assertNoErrors, + assertSilence, + assertContentProd + ) + ) + ), testWithOption({ attempts: 1 })( testDefault( buildDevNormal( From 514cefb0e5e1cc31d0428ddea6fc36d5df8d13a7 Mon Sep 17 00:00:00 2001 From: Ben Holloway Date: Wed, 9 Jun 2021 23:25:54 +1000 Subject: [PATCH 2/2] fix premature exit of test process on windows --- packages/test-my-cli/operations/exec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/test-my-cli/operations/exec.js b/packages/test-my-cli/operations/exec.js index 20d9a9b..93fc06d 100644 --- a/packages/test-my-cli/operations/exec.js +++ b/packages/test-my-cli/operations/exec.js @@ -100,7 +100,7 @@ exports.create = (command) => { addOrRemove(false); resolve({ index, root, caller, cwd, env, meta, code, stdout, - stderr: caughtError ? caughtError.toString() : stderr + stderr: [ stderr, caughtError ].filter(Boolean).map(String).join('\n') }); } })