Update test cases and npm scripts

Author: WezomDev

.gitignore

@@ -1,5 +1,6 @@
 .idea/
 .cache/
+coverage/
 node_modules/
 *.log*
 .DS_Store

package-lock.json

@@ -4,16 +4,17 @@
   "description": "The custom `sort` method (mobile-first / desktop-first) of CSS media queries for `postcss-sort-media-queries`, `css-mqpacker` or `pleeease` (which uses css-mqpacker) or, perhaps, something else ))",
   "main": "lib/index.js",
   "files": [
-    "lib/index.js",
-    "lib/index.d.ts"
+    "lib"
   ],
   "scripts": {
     "test": "npm run prettier && npm run eslint && npm run jest",
-    "jest": "jest",
+    "test:fix": "npm run prettier:fix && npm run eslint:fix && npm run jest:coverage",
     "prettier": "prettier \"./{lib,tests}/**\" --check",
     "prettier:fix": "npm run prettier -- --write",
     "eslint": "eslint \"./{lib,tests}/**/*.js\"",
-    "eslint:fix": "npm run eslint -- --fix"
+    "eslint:fix": "npm run eslint -- --fix",
+    "jest": "jest",
+    "jest:coverage": "npm run jest -- --coverage"
   },
   "jest": {
     "verbose": true,
@@ -57,5 +58,8 @@
     "eslint-plugin-promise": "^5.1.0",
     "jest": "^26.4.2",
     "prettier": "^2.3.0"
+  },
+  "dependencies": {
+    "mkdirp": "^1.0.4"
   }
 }

package.json

@@ -0,0 +1,3 @@
+{
+  "unitlessMqAlwaysFirst": false
+}

sort-css-mq.config.json

@@ -1,6 +1,7 @@
-const sortCSSmq = require('../lib');
+const createSort = require('../lib/create-sort');
+const sortCSSmq = createSort();
 
-it(`simple #1. mobile-first`, () => {
+test(`simple #1. mobile-first`, () => {
 	const receivedOrder = [
 		'screen and (max-width: 640px)',
 		'screen and (min-width: 980px)',
@@ -29,7 +30,7 @@ it(`simple #1. mobile-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`simple #1. desktop-first`, () => {
+test(`simple #1. desktop-first`, () => {
 	const receivedOrder = [
 		'screen and (max-width: 640px)',
 		'screen and (min-width: 980px)',
@@ -58,7 +59,7 @@ it(`simple #1. desktop-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`simple #2. mobile-first`, () => {
+test(`simple #2. mobile-first`, () => {
 	const receivedOrder = [
 		'screen and (max-width: 640px)',
 		'screen and (max-width: 640px)',
@@ -79,7 +80,7 @@ it(`simple #2. mobile-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`simple #2. desktop-first`, () => {
+test(`simple #2. desktop-first`, () => {
 	const receivedOrder = [
 		'screen and (max-width: 640px)',
 		'screen and (max-width: 640px)',
@@ -100,7 +101,7 @@ it(`simple #2. desktop-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`without dimension #1. mobile-first`, () => {
+test(`without dimension #1. mobile-first`, () => {
 	const receivedOrder = [
 		'tv',
 		'print and (orientation: landscape)',
@@ -131,7 +132,7 @@ it(`without dimension #1. mobile-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`without dimension #1. desktop-first`, () => {
+test(`without dimension #1. desktop-first`, () => {
 	const receivedOrder = [
 		'tv',
 		'print and (orientation: landscape)',
@@ -162,7 +163,7 @@ it(`without dimension #1. desktop-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`mixed #1. mobile-first`, () => {
+test(`mixed #1. mobile-first`, () => {
 	const receivedOrder = [
 		'tv',
 		'print and (orientation: landscape)',
@@ -195,7 +196,7 @@ it(`mixed #1. mobile-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`mixed #1. desktop-first`, () => {
+test(`mixed #1. desktop-first`, () => {
 	const receivedOrder = [
 		'tv',
 		'print and (orientation: landscape)',
@@ -228,7 +229,7 @@ it(`mixed #1. desktop-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`multiline #1. mobile-first`, () => {
+test(`multiline #1. mobile-first`, () => {
 	const receivedOrder = [
 		`@media (min-width: 48em)
        and (max-width: 59.999em)`,
@@ -269,7 +270,7 @@ it(`multiline #1. mobile-first`, () => {
 	expect(received).toBe(expected);
 });
 
-it(`multiline #2. mobile-first`, () => {
+test(`multiline #2. mobile-first`, () => {
 	// Edge cases
 	const receivedOrder = [
 		`

tests/bundle.test.js renamed to tests/create-sort.spec.js

@@ -0,0 +1,49 @@
+const createSort = require('../lib/create-sort');
+
+test(`unitlessMqAlwaysFirst: FALSE`, () => {
+	const sort = createSort({
+		unitlessMqAlwaysFirst: false
+	});
+
+	const receivedOrder = [
+		'screen and (max-width: 640px)',
+		'screen and (min-width: 980px)',
+		'screen and (max-width: 980px)',
+		'tv',
+		'screen and (max-width: 768px)',
+		'screen and (min-width: 640px)',
+		'print',
+		'screen and (min-width: 1280px)',
+		'screen',
+		'screen and (min-width: 768px)',
+		'screen and (max-width: 1280px)'
+	];
+
+	const expectedOrder = [
+		'screen and (min-width: 640px)',
+		'screen and (min-width: 768px)',
+		'screen and (min-width: 980px)',
+		'screen and (min-width: 1280px)',
+		'screen and (max-width: 1280px)',
+		'screen and (max-width: 980px)',
+		'screen and (max-width: 768px)',
+		'screen and (max-width: 640px)',
+		'screen',
+		'tv',
+		'print' // always last
+	];
+
+	const expected = expectedOrder.join('\n');
+	const received = receivedOrder.sort(sort).join('\n');
+	expect(received).toBe(expected);
+});
+
+test(`unitlessMqAlwaysFirst: TRUE`, () => {
+	// eslint-disable-next-line no-unused-vars
+	const sort = createSort({
+		unitlessMqAlwaysFirst: true
+	});
+
+	// TODO add test cases
+	expect(true).toBe(true);
+});

tests/create-sort.unitless-mq-always-first.spec.js

@@ -0,0 +1,36 @@
+const fs = require('fs');
+const path = require('path');
+const mkdirp = require('mkdirp');
+
+const loadConfig = require('../lib/load-config');
+const defaultConfig = require('../sort-css-mq.config.json');
+
+test('load default config', () => {
+	const loadedConfig = loadConfig();
+	expect(loadedConfig).toEqual(defaultConfig);
+});
+
+describe('load custom config', () => {
+	const customConfig = { unitlessMqAlwaysFirst: true };
+	const cwd = process.cwd();
+	const testFolder = '.cache/tests/';
+	mkdirp.sync(path.join(cwd, '.cache/tests/'));
+
+	const testConfigPath = path.join(testFolder, 'sort-css-mq.config.json');
+	const testConfigString = JSON.stringify(customConfig, undefined, '  ');
+	fs.writeFileSync(testConfigPath, testConfigString);
+
+	const testPkgPath = path.join(testFolder, 'pkg.json');
+	const testPkgString = JSON.stringify({ sortCssMQ: customConfig }, undefined, '  ');
+	fs.writeFileSync(testPkgPath, testPkgString);
+
+	test('load from custom config file', () => {
+		const loadedConfig = loadConfig(testConfigPath);
+		expect(loadedConfig).toEqual(customConfig);
+	});
+
+	test('load from custom pkg file', () => {
+		const loadedConfig = loadConfig('some-non-existent-file.json', testPkgPath);
+		expect(loadedConfig).toEqual(customConfig);
+	});
+});