refactor: tests

Author: alexander-akait

package-lock.json

@@ -67,7 +67,6 @@
     "url-loader": "^1.0.1",
     "husky": "^0.14.3",
     "jest": "^23.4.0",
-    "jest-serializer-path": "^0.1.15",
     "lint-staged": "^7.2.0",
     "memory-fs": "^0.4.1",
     "nsp": "^3.2.1",
@@ -90,11 +89,9 @@
     ]
   },
   "jest": {
+    "testURL": "http://localhost",
     "collectCoverageFrom": [
       "src/**/*.js"
-    ],
-    "snapshotSerializers": [
-      "jest-serializer-path"
     ]
   }
 }

package.json

@@ -162,10 +162,6 @@ export default function loader(content, map, meta) {
       );
     })
     .catch((err) => {
-      if (err.file) {
-        this.addDependency(err.file);
-      }
-
       cb(err.name === 'CssSyntaxError' ? new SyntaxError(err) : err);
     });
 }

src/index.js

@@ -19,16 +19,16 @@ module.exports = function(useSourceMap) {
 
   // import a list of modules into the list
   list.i = function(modules, mediaQuery) {
-    if (typeof modules === "string") {
-      modules = [[null, modules, ""]];
+    if (typeof modules === 'string') {
+      modules = [[null, modules, '']];
     }
 
     const isImported = {};
 
     for (let i = 0; i < this.length; i++) {
       const id = this[i][0];
 
-      if (typeof id === "number") {
+      if (typeof id === 'number') {
         isImported[id] = true;
       }
     }
@@ -40,11 +40,11 @@ module.exports = function(useSourceMap) {
       // this implementation is not 100% perfect for weird media query combinations
       // when a module is imported multiple times with different media queries.
       // I hope this will never occur (Hey this way we have smaller bundles)
-      if (typeof item[0] !== "number" || !isImported[item[0]]) {
+      if (typeof item[0] !== 'number' || !isImported[item[0]]) {
         if (mediaQuery && !item[2]) {
           item[2] = mediaQuery;
         } else if (mediaQuery) {
-          item[2] = "(" + item[2] + ") and (" + mediaQuery + ")";
+          item[2] = '(' + item[2] + ') and (' + mediaQuery + ')';
         }
 
         list.push(item);
@@ -56,34 +56,34 @@ module.exports = function(useSourceMap) {
 };
 
 function cssWithMappingToString(item, useSourceMap) {
-  const content = item[1] || "";
+  const content = item[1] || '';
   const sourceMap = item[3];
 
   if (!sourceMap) {
     return content;
   }
 
-  if (useSourceMap && typeof btoa === "function") {
+  if (useSourceMap && typeof btoa === 'function') {
     const sourceMapping = toComment(sourceMap);
     const sourceURLs = sourceMap.sources.map(function(source) {
-      return "/*# sourceURL=" + sourceMap.sourceRoot + source + " */";
+      return '/*# sourceURL=' + sourceMap.sourceRoot + source + ' */';
     });
 
     return [content]
       .concat(sourceURLs)
       .concat([sourceMapping])
-      .join("\n");
+      .join('\n');
   }
 
-  return [content].join("\n");
+  return [content].join('\n');
 }
 
 // Adapted from convert-source-map (MIT)
 function toComment(sourceMap) {
   // eslint-disable-next-line no-undef
   const base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
   const data =
-    "sourceMappingURL=data:application/json;charset=utf-8;base64," + base64;
+    'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
 
-  return "/*# " + data + " */";
+  return '/*# ' + data + ' */';
 }

src/runtime.js

@@ -224,7 +224,7 @@ exports[`import true from modules: warnings 1`] = `Array []`;
 
 exports[`import true invalid: errors 1`] = `
 Array [
-  [ModuleBuildError: Module build failed (from <PROJECT_ROOT>/src/index.js):
+  [ModuleBuildError: Module build failed (from /home/evilebottnawi/IdeaProjects/css-loader/src/index.js):
 Syntax Error: Unexpected format  (1:1)
 
 > 1 | @import;

test/__snapshots__/import-option.test.js.snap

@@ -83,16 +83,16 @@ module.exports = function (useSourceMap) {
 
   // import a list of modules into the list
   list.i = function (modules, mediaQuery) {
-    if (typeof modules === \\"string\\") {
-      modules = [[null, modules, \\"\\"]];
+    if (typeof modules === 'string') {
+      modules = [[null, modules, '']];
     }
 
     const isImported = {};
 
     for (let i = 0; i < this.length; i++) {
       const id = this[i][0];
 
-      if (typeof id === \\"number\\") {
+      if (typeof id === 'number') {
         isImported[id] = true;
       }
     }
@@ -104,11 +104,11 @@ module.exports = function (useSourceMap) {
       // this implementation is not 100% perfect for weird media query combinations
       // when a module is imported multiple times with different media queries.
       // I hope this will never occur (Hey this way we have smaller bundles)
-      if (typeof item[0] !== \\"number\\" || !isImported[item[0]]) {
+      if (typeof item[0] !== 'number' || !isImported[item[0]]) {
         if (mediaQuery && !item[2]) {
           item[2] = mediaQuery;
         } else if (mediaQuery) {
-          item[2] = \\"(\\" + item[2] + \\") and (\\" + mediaQuery + \\")\\";
+          item[2] = '(' + item[2] + ') and (' + mediaQuery + ')';
         }
 
         list.push(item);
@@ -120,32 +120,32 @@ module.exports = function (useSourceMap) {
 };
 
 function cssWithMappingToString(item, useSourceMap) {
-  const content = item[1] || \\"\\";
+  const content = item[1] || '';
   const sourceMap = item[3];
 
   if (!sourceMap) {
     return content;
   }
 
-  if (useSourceMap && typeof btoa === \\"function\\") {
+  if (useSourceMap && typeof btoa === 'function') {
     const sourceMapping = toComment(sourceMap);
     const sourceURLs = sourceMap.sources.map(function (source) {
-      return \\"/*# sourceURL=\\" + sourceMap.sourceRoot + source + \\" */\\";
+      return '/*# sourceURL=' + sourceMap.sourceRoot + source + ' */';
     });
 
-    return [content].concat(sourceURLs).concat([sourceMapping]).join(\\"/n\\");
+    return [content].concat(sourceURLs).concat([sourceMapping]).join('\\\\n');
   }
 
-  return [content].join(\\"/n\\");
+  return [content].join('\\\\n');
 }
 
 // Adapted from convert-source-map (MIT)
 function toComment(sourceMap) {
   // eslint-disable-next-line no-undef
   const base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
-  const data = \\"sourceMappingURL=data:application/json;charset=utf-8;base64,\\" + base64;
+  const data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
 
-  return \\"/*# \\" + data + \\" */\\";
+  return '/*# ' + data + ' */';
 }"
 `;
 
@@ -166,8 +166,8 @@ module.exports = function escape(url) {
 
   // Should url be wrapped?
   // See https://drafts.csswg.org/css-values-3/#urls
-  if (/[\\"'() /t/n]/.test(url)) {
-    return '\\"' + url.replace(/\\"/g, '//\\"').replace(//n/g, '//n') + '\\"';
+  if (/[\\"'() \\\\t\\\\n]/.test(url)) {
+    return '\\"' + url.replace(/\\"/g, '\\\\\\\\\\"').replace(/\\\\n/g, '\\\\\\\\n') + '\\"';
   }
 
   return url;
@@ -202,7 +202,7 @@ exports[`loader error when no loader for url assets: warnings 1`] = `Array []`;
 
 exports[`loader error when source code is invalid: errors 1`] = `
 Array [
-  [ModuleBuildError: Module build failed (from <PROJECT_ROOT>/src/index.js):
+  [ModuleBuildError: Module build failed (from /home/evilebottnawi/IdeaProjects/css-loader/src/index.js):
 Syntax Error: Unknown word (2:3)
 
   1 | .some {
@@ -292,130 +292,3 @@ a:hover {
 `;
 
 exports[`loader using together with "postcss-loader" (reuse ast): warnings 1`] = `Array []`;
-
-exports[`loader validate options import - false (boolean): errors 1`] = `Array []`;
-
-exports[`loader validate options import - false (boolean): warnings 1`] = `Array []`;
-
-exports[`loader validate options import - true (boolean): errors 1`] = `Array []`;
-
-exports[`loader validate options import - true (boolean): warnings 1`] = `Array []`;
-
-exports[`loader validate options import - true (string): errors 1`] = `
-Array [
-  [ModuleBuildError: Module build failed (from <PROJECT_ROOT>/src/index.js):
-CSS Loader
-
-  Options Validation Error
-
-  options.import  should be boolean
-
-
-  options.import  should be boolean
-    at validate (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:87:15)
-    at validator (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:118:10)
-    at Object.loader (<PROJECT_ROOT>/src/index.js:29:3)],
-]
-`;
-
-exports[`loader validate options import - true (string): warnings 1`] = `Array []`;
-
-exports[`loader validate options importLoaders - 0 (number): errors 1`] = `Array []`;
-
-exports[`loader validate options importLoaders - 0 (number): warnings 1`] = `Array []`;
-
-exports[`loader validate options importLoaders - 1 (number): errors 1`] = `Array []`;
-
-exports[`loader validate options importLoaders - 1 (number): warnings 1`] = `Array []`;
-
-exports[`loader validate options importLoaders - 1 (string): errors 1`] = `
-Array [
-  [ModuleBuildError: Module build failed (from <PROJECT_ROOT>/src/index.js):
-CSS Loader
-
-  Options Validation Error
-
-  options.importLoaders  should be number
-
-
-  options.importLoaders  should be number
-    at validate (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:87:15)
-    at validator (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:118:10)
-    at Object.loader (<PROJECT_ROOT>/src/index.js:29:3)],
-]
-`;
-
-exports[`loader validate options importLoaders - 1 (string): warnings 1`] = `Array []`;
-
-exports[`loader validate options sourceMap - false (boolean): errors 1`] = `Array []`;
-
-exports[`loader validate options sourceMap - false (boolean): warnings 1`] = `Array []`;
-
-exports[`loader validate options sourceMap - true (boolean): errors 1`] = `Array []`;
-
-exports[`loader validate options sourceMap - true (boolean): warnings 1`] = `Array []`;
-
-exports[`loader validate options sourceMap - true (string): errors 1`] = `
-Array [
-  [ModuleBuildError: Module build failed (from <PROJECT_ROOT>/src/index.js):
-CSS Loader
-
-  Options Validation Error
-
-  options.sourceMap  should be boolean
-
-
-  options.sourceMap  should be boolean
-    at validate (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:87:15)
-    at validator (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:118:10)
-    at Object.loader (<PROJECT_ROOT>/src/index.js:29:3)],
-]
-`;
-
-exports[`loader validate options sourceMap - true (string): warnings 1`] = `Array []`;
-
-exports[`loader validate options unknown option: errors 1`] = `
-Array [
-  [ModuleBuildError: Module build failed (from <PROJECT_ROOT>/src/index.js):
-CSS Loader
-
-  Options Validation Error
-
-  options['unknow']  is an invalid additional property
-
-
-  options['unknow']  is an invalid additional property
-    at validate (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:87:15)
-    at validator (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:118:10)
-    at Object.loader (<PROJECT_ROOT>/src/index.js:29:3)],
-]
-`;
-
-exports[`loader validate options unknown option: warnings 1`] = `Array []`;
-
-exports[`loader validate options url - false (boolean): errors 1`] = `Array []`;
-
-exports[`loader validate options url - false (boolean): warnings 1`] = `Array []`;
-
-exports[`loader validate options url - true (boolean): errors 1`] = `Array []`;
-
-exports[`loader validate options url - true (boolean): warnings 1`] = `Array []`;
-
-exports[`loader validate options url - true (string): errors 1`] = `
-Array [
-  [ModuleBuildError: Module build failed (from <PROJECT_ROOT>/src/index.js):
-CSS Loader
-
-  Options Validation Error
-
-  options.url  should be boolean
-
-
-  options.url  should be boolean
-    at validate (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:87:15)
-    at validator (<PROJECT_ROOT>/node_modules/@webpack-contrib/schema-utils/dist/validate-options.js:118:10)
-    at Object.loader (<PROJECT_ROOT>/src/index.js:29:3)],
-]
-`;
-
-exports[`loader validate options url - true (string): warnings 1`] = `Array []`;

test/__snapshots__/loader.test.js.snap

@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`runtime should import modules 1`] = `"body { b: 2; }body { c: 3; }@media print{body { d: 4; }}.a { color: red; }@media (screen) and (print){body { a: 1; }}@media (screen) and (print){body { a: 1; }}"`;
+
+exports[`runtime toString with a single module 1`] = `"body { a: 1; }"`;
+
+exports[`runtime toString with media query 1`] = `"@media screen{body { a: 1; }}"`;
+
+exports[`runtime toString with multiple modules 1`] = `"body { b: 2; }body { a: 1; }"`;
+
+exports[`runtime toString with source mapping 1`] = `
+"body { a: 1; }
+/*# sourceURL=webpack://./path/to/test.scss */
+/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoidGVzdC5zY3NzIiwic291cmNlcyI6WyIuL3BhdGgvdG8vdGVzdC5zY3NzIl0sIm1hcHBpbmdzIjoiQUFBQTsiLCJzb3VyY2VSb290Ijoid2VicGFjazovLyJ9 */"
+`;
+
+exports[`runtime toString without source mapping if btoa not avalibale 1`] = `"body { a: 1; }"`;

test/__snapshots__/runtime.test.js.snap

@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`runtimeEscape escape 1`] = `true`;
+
+exports[`runtimeEscape escape 2`] = `"image.png"`;
+
+exports[`runtimeEscape escape 3`] = `"image.png"`;
+
+exports[`runtimeEscape escape 4`] = `"image.png"`;
+
+exports[`runtimeEscape escape 5`] = `"\\"image other.png\\""`;
+
+exports[`runtimeEscape escape 6`] = `"\\"image other.png\\""`;
+
+exports[`runtimeEscape escape 7`] = `"\\"image other.png\\""`;
+
+exports[`runtimeEscape escape 8`] = `"\\"image\\\\\\"other.png\\""`;
+
+exports[`runtimeEscape escape 9`] = `"\\"image\\\\nother.png\\""`;