adjust test cases for changed debug and error messages

Author: bholloway

test/cases/absolute-asset.js

@@ -19,7 +19,7 @@ const {
 
 const assertDebugMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]+${process.cwd()}.*${join('images', 'img.jpg')}
-  [ ]+-empty-
+  [ ]+-empty- --> ./images/img.jpg
   [ ]+FOUND$
   `;
 

test/cases/adjacent-asset.js

@@ -20,7 +20,7 @@ const {
 
 const assertDebugMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'../../../packageB/images/img.jpg'}
-  [ ]+${'./src/feature'}
+  [ ]+${'./src/feature'} --> ${'../packageB/images/img.jpg'}
   [ ]+FOUND$
   `;
 

test/cases/common/test/invalid.js

@@ -71,32 +71,58 @@ exports.testFail = (...rest) =>
     )
   );
 
-exports.testNonFunctionJoin = (...rest) =>
+exports.testNonFunctionJoin1 = (...rest) =>
   test(
-    'join=!function',
+    'join1=!function',
     layer()(
       env({
         LOADER_JOIN: 'return 1;',
-        OUTPUT: 'non-function-join'
+        OUTPUT: 'non-function-join1'
       }),
       ...rest,
       test('validate', assertStderr('options.join')(1)`join: 1`)
     )
   );
 
-exports.testWrongArityJoin = (...rest) =>
+exports.testWrongArityJoin1 = (...rest) =>
   test(
-    'join=!arity1',
+    'join1=!arity2',
+    layer()(
+      env({
+        LOADER_JOIN: 'return (a) => (b) => undefined;',
+        OUTPUT: 'wrong-arity-join1'
+      }),
+      ...rest,
+      test('validate', assertStderr('options.join')(1)`join: \(a\) => \(b\) => undefined`)
+    )
+  );
+
+exports.testNonFunctionJoin2 = (...rest) =>
+  test(
+    'join2=!function',
     layer()(
       env({
         LOADER_JOIN: 'return (a, b) => undefined;',
-        OUTPUT: 'wrong-arity-join'
+        OUTPUT: 'non-function-join2'
       }),
       ...rest,
       test('validate', assertStderr('options.join')(1)`join: \(a, b\) => undefined`)
     )
   );
 
+exports.testWrongArityJoin2 = (...rest) =>
+  test(
+    'join2=!arity',
+    layer()(
+      env({
+        LOADER_JOIN: 'return (a, b) => (c, d) => undefined;',
+        OUTPUT: 'wrong-arity-join2'
+      }),
+      ...rest,
+      test('validate', assertStderr('options.join')(1)`join: \(a, b\) => \(c, d\) => undefined`)
+    )
+  );
+
 exports.testNonStringRoot = (...rest) =>
   test(
     'root=!string',

test/cases/declaration-mixin.postcss.js

@@ -20,14 +20,14 @@ const {
 
 const assertIncludeMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'img.jpg'}
-  [ ]+${'./src/feature'}
-  [ ]+${'./src'}
+  [ ]+${'./src/feature'} --> ${'./src/feature/img.jpg'}
+  [ ]+${'./src'}         --> ${'./src/img.jpg'}
   [ ]+FOUND$
   `;
 
 const assertMixinMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'img.jpg'}
-  [ ]+${'./src/feature'}
+  [ ]+${'./src/feature'} --> ${'./src/feature/img.jpg'}
   [ ]+FOUND$
   `;
 

test/cases/declaration-variable.postcss.js

@@ -20,22 +20,22 @@ const {
 
 const assertPropertyMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'img.jpg'}
-  [ ]+${'./src/value/substring'}
-  [ ]+${'./src/value'}
-  [ ]+${'./src'}
+  [ ]+${'./src/value/substring'} --> ${'./src/value/substring/img.jpg'}
+  [ ]+${'./src/value'}           --> ${'./src/value/img.jpg'}
+  [ ]+${'./src'}                 --> ${'./src/img.jpg'}
   [ ]+FOUND$
   `;
 
 const assertValueMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'img.jpg'}
-  [ ]+${'./src/value/substring'}
-  [ ]+${'./src/value'}
+  [ ]+${'./src/value/substring'} --> ${'./src/value/substring/img.jpg'}
+  [ ]+${'./src/value'}           --> ${'./src/value/img.jpg'}
   [ ]+FOUND$
   `;
 
 const assertSubstringMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'img.jpg'}
-  [ ]+${'./src/value/substring'}
+  [ ]+${'./src/value/substring'} --> ${'./src/value/substring/img.jpg'}
   [ ]+FOUND$
   `;
 

test/cases/deep-asset.js

@@ -20,7 +20,7 @@ const {
 
 const assertDebugMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'images/img.jpg'}
-  [ ]+${'./src/feature'}
+  [ ]+${'./src/feature'} --> ${'./src/feature/images/img.jpg'}
   [ ]+FOUND$
   `;
 

test/cases/immediate-asset.js

@@ -20,7 +20,7 @@ const {
 
 const assertDebugMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'img.jpg'}
-  [ ]+${'./src/feature'}
+  [ ]+${'./src/feature'} --> ${'./src/feature/img.jpg'}
   [ ]+FOUND$
   `;
 

test/cases/misconfiguration.js

@@ -10,8 +10,8 @@ const {trim} = require('../lib/util');
 const {rebaseToCache} = require('../lib/higher-order');
 const {
   all, testDefault, testSilent, testKeepQuery, testAbsolute, testAttempts, testEngineFailInitialisation,
-  testEngineFailProcessing, testIncludeRoot, testFail, testNonFunctionJoin, testWrongArityJoin, testNonStringRoot,
-  testNonExistentRoot
+  testEngineFailProcessing, testIncludeRoot, testFail, testNonFunctionJoin1, testWrongArityJoin1, testNonFunctionJoin2,
+  testWrongArityJoin2, testNonStringRoot, testNonExistentRoot
 } = require('./common/test');
 const {buildDevNormal, buildProdNormal} = require('./common/exec');
 const {assertCssContent} = require('../lib/assert');
@@ -246,19 +246,35 @@ module.exports = test(
         )
       )
     ),
-    testNonFunctionJoin(
+    testNonFunctionJoin1(
       all(testDefault, testSilent)(
         all(buildDevNormal, buildProdNormal)(
           assertWebpackNotOk,
           assertMisconfigError('"join" option must be a Function')
         )
       )
     ),
-    testWrongArityJoin(
+    testWrongArityJoin1(
       all(testDefault, testSilent)(
         all(buildDevNormal, buildProdNormal)(
           assertWebpackNotOk,
-          assertMisconfigError('"join" Function must take exactly 1 arguments (options hash)')
+          assertMisconfigError('"join" Function must take exactly 2 arguments (options, loader)')
+        )
+      )
+    ),
+    testNonFunctionJoin2(
+      all(testDefault, testSilent)(
+        all(buildDevNormal, buildProdNormal)(
+          assertWebpackNotOk,
+          assertMisconfigError('"join" option must itself return a Function when it is called')
+        )
+      )
+    ),
+    testWrongArityJoin2(
+      all(testDefault, testSilent)(
+        all(buildDevNormal, buildProdNormal)(
+          assertWebpackNotOk,
+          assertMisconfigError('"join" Function must create a function that takes exactly 1 arguments (item)')
         )
       )
     ),

test/cases/orphan-carriage-return.postcss.js

@@ -20,7 +20,7 @@ const {
 
 const assertDebugMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'img.jpg'}
-  [ ]+${'./src'}
+  [ ]+${'./src'} --> ${'./src/img.jpg'}
   [ ]+FOUND$
   `;
 

test/cases/root-relative-asset.js

@@ -20,7 +20,7 @@ const {
 
 const assertDebugMessages = assertStdout('debug')(1)`
   ^resolve-url-loader:[^:]+:[ ]*${'/images/img.jpg'}
-  [ ]+${'.'}
+  [ ]+${'.'} --> ${'./images/img.jpg'}
   [ ]+FOUND$
   `;