Merge pull request #9 from zgreen/tests-fix-warnings

Tests fix warnings

lib/index.js

@@ -47,7 +47,11 @@ function buildCritical(options) {
       criticalCSS.append(criticalOutput[cur]);
       (0, _postcss2.default)(args.minify ? [(0, _cssnano2.default)()] : []).process(criticalCSS).then(function (result) {
         if (!args.dryRun) {
-          _fs2.default.writeFile(_path2.default.join(args.outputPath, cur), result.css);
+          _fs2.default.writeFile(_path2.default.join(args.outputPath, cur), result.css, function (err) {
+            if (err) {
+              throw new Error(err);
+            }
+          });
         } else {
           console.log( // eslint-disable-line no-console
           _chalk2.default.green('\nCritical CSS result is:\n' + _chalk2.default.yellow(result.css)));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-critical-css",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Generate critical CSS using PostCSS",
   "main": "index.js",
   "repository": {
@@ -28,7 +28,6 @@
     "chalk": "^1.1.3",
     "cssnano": "^3.5.2",
     "eslint": "^3.3.1",
-    "eslint-config-airbnb": "^10.0.1",
     "eslint-config-standard": "^6.2.1",
     "eslint-plugin-flowtype": "^2.7.1",
     "eslint-plugin-import": "^1.13.0",
@@ -43,7 +42,7 @@
     "build": "eslint src/** && npm run flow && babel src --out-dir lib",
     "example": "./node_modules/.bin/babel-node example/example.js",
     "flow": "flow; test $? -eq 0 -o $? -eq 2",
-    "eslint": "eslint src/**",
+    "eslint": "eslint test/**/*.js && eslint src/**",
     "start": "eslint src/** && npm run flow && babel src/index.js --out-file index.js --watch",
     "pretest": "./node_modules/.bin/babel-node test/preTest.js",
     "test": "npm run pretest && tape test"

src/getCriticalDestination.js

@@ -7,7 +7,7 @@
  * @param {string} Default output CSS file name.
  * @return {string} String corresponding to output destination.
  */
-export function getCriticalDestination (rule: Object, dest: String): string {
+export function getCriticalDestination (rule: Object, dest: string): string {
   rule.walkDecls('critical-filename', (decl: Object) => {
     dest = decl.value.replace(/['"]*/g, '')
     decl.remove()

src/getCriticalRules.js

@@ -12,7 +12,7 @@ import { getCriticalDestination } from './getCriticalDestination'
  * @param {string} Default output CSS file name.
  * @return {object} Object containing critical rules, organized by output destination
  */
-export function getCriticalRules (css: Object, shouldPreserve: boolean, defaultDest: String): Object {
+export function getCriticalRules (css: Object, shouldPreserve: boolean, defaultDest: string): Object {
   const critical = getCriticalFromAtRule({ css })
   css.walkDecls('critical-selector', (decl: Object) => {
     const dest = getCriticalDestination(decl.parent, defaultDest)

src/index.js

@@ -40,7 +40,12 @@ function buildCritical (options: ArgsType): Function {
           if (!args.dryRun) {
             fs.writeFile(
               path.join(args.outputPath, cur),
-              result.css
+              result.css,
+              (err) => {
+                if (err) {
+                  throw new Error(err)
+                }
+              }
             )
           } else {
             console.log( // eslint-disable-line no-console

test/fixtures/critical.css

@@ -0,0 +1 @@
+.default{color:orange;float:left;margin-right:1em;width:100%}

test/fixtures/default.critical.expected.css

@@ -0,0 +1 @@
+.default{color:orange;float:left;margin-right:1em;width:100%}

test/fixtures/default.css

@@ -0,0 +1,8 @@
+@critical;
+
+.default {
+  color: orange;
+  float: left;
+  margin-right: 1em;
+  width: 100%;
+}

test/fixtures/default.non-critical.actual.css

@@ -0,0 +1,6 @@
+.default {
+  color: orange;
+  float: left;
+  margin-right: 1em;
+  width: 100%;
+}

test/fixtures/default.non-critical.expected.css

@@ -0,0 +1,6 @@
+.default {
+  color: orange;
+  float: left;
+  margin-right: 1em;
+  width: 100%;
+}

test/index.js

@@ -1,70 +1,81 @@
 #!/usr/bin/env node
 
-var fs = require('fs')
-var test = require('tape')
-var postcss = require('postcss')
-var postcssCriticalCSS = require('..');
-const basePath = `${process.cwd()}/test/fixtures`;
-const chalk = require('chalk');
+const fs = require('fs')
+const test = require('tape')
+const basePath = `${process.cwd()}/test/fixtures`
+const chalk = require('chalk')
 
-function compareCritical(t, name, testNonCritical) {
+function compareCritical (t, name, testNonCritical) {
+  const actualFilename = name.indexOf('default') !== -1 && !testNonCritical
+    ? 'critical'
+    : `${name}.${testNonCritical ? 'non-critical.actual' : 'critical.actual'}`
   t.equal(
     fs.readFileSync(
-`${basePath}/${name}.${testNonCritical ? 'non-critical.actual' : 'critical.actual'}.css`, 'utf8'
+`${basePath}/${actualFilename}.css`, 'utf8'
     ).trim(),
     fs.readFileSync(
 `${basePath}/${name}.${testNonCritical ? 'non-critical.expected' : 'critical.expected'}.css`, 'utf8'
     ).trim(),
     `processed fixture ${chalk.bold(name)} should be equal to expected output`
-  );
+  )
 }
 
-test('Testing "this" critical result', function(t) {
-  compareCritical(t, 'this');
-  t.end();
-});
+test('Testing default critical result', (t) => {
+  compareCritical(t, 'default')
+  t.end()
+})
 
-test('Testing "this" non-critical result', function(t) {
-  compareCritical(t, 'this', true);
-  t.end();
-});
+test('Testing default non-critical result', (t) => {
+  compareCritical(t, 'default', true)
+  t.end()
+})
 
-test('Testing "atRule" critical result', function(t) {
-  compareCritical(t, 'atRule');
-  t.end();
-});
+test('Testing "this" critical result', (t) => {
+  compareCritical(t, 'this')
+  t.end()
+})
 
-test('Testing "atRule" non-critical result', function(t) {
-  compareCritical(t, 'atRule', true);
-  t.end();
-});
+test('Testing "this" non-critical result', (t) => {
+  compareCritical(t, 'this', true)
+  t.end()
+})
 
-test(chalk.yellow(`Testing ${chalk.bold('atRule.wrapping')} critical result`), function(t) {
-  compareCritical(t, 'atRule-wrapping');
-  t.end();
-});
+test('Testing "atRule" critical result', (t) => {
+  compareCritical(t, 'atRule')
+  t.end()
+})
 
-test(chalk.yellow(`Testing ${chalk.bold('atRule.wrapping')} non-critical result`), function(t) {
-  compareCritical(t, 'atRule-wrapping', true);
-  t.end();
-});
+test('Testing "atRule" non-critical result', (t) => {
+  compareCritical(t, 'atRule', true)
+  t.end()
+})
 
-test('Testing "media" critical result', function(t) {
-  compareCritical(t, 'media');
-  t.end();
-});
+test(chalk.yellow(`Testing ${chalk.bold('atRule.wrapping')} critical result`), (t) => {
+  compareCritical(t, 'atRule-wrapping')
+  t.end()
+})
 
-test('Testing "media" non-critical result', function(t) {
-  compareCritical(t, 'media', true);
-  t.end();
-});
+test(chalk.yellow(`Testing ${chalk.bold('atRule.wrapping')} non-critical result`), (t) => {
+  compareCritical(t, 'atRule-wrapping', true)
+  t.end()
+})
 
-test(chalk.yellow(`Testing ${chalk.bold('scope')} critical result`), function(t) {
-  compareCritical(t, 'scope');
-  t.end();
-});
+test('Testing "media" critical result', (t) => {
+  compareCritical(t, 'media')
+  t.end()
+})
 
-test(chalk.yellow(`Testing ${chalk.bold('scope')} non-critical result`), function(t) {
-  compareCritical(t, 'scope', true);
-  t.end();
-});
+test('Testing "media" non-critical result', (t) => {
+  compareCritical(t, 'media', true)
+  t.end()
+})
+
+test(chalk.yellow(`Testing ${chalk.bold('scope')} critical result`), (t) => {
+  compareCritical(t, 'scope')
+  t.end()
+})
+
+test(chalk.yellow(`Testing ${chalk.bold('scope')} non-critical result`), (t) => {
+  compareCritical(t, 'scope', true)
+  t.end()
+})

test/preTest.js

@@ -1,27 +1,39 @@
 #!/usr/bin/env node
-var fs = require('fs')
-var test = require('tape')
-var postcss = require('postcss')
-var postcssCriticalCSS = require('..');
+const fs = require('fs')
+const postcss = require('postcss')
+const postcssCriticalCSS = require('..')
+const basePath = `${process.cwd()}/test/fixtures`
 
-const basePath = `${process.cwd()}/test/fixtures`;
 function cb (files) {
   function useFileData (data, file) {
     postcss([postcssCriticalCSS({outputPath: basePath})])
       .process(data)
-      .then(result => fs.writeFile(`${basePath}/${file.split('.')[0]}.non-critical.actual.css`, result.css))
+      .then(result => fs.writeFile(
+        `${basePath}/${file.split('.')[0]}.non-critical.actual.css`,
+        result.css,
+        'utf8',
+        (err) => {
+          if (err) {
+            throw new Error(err)
+          }
+        }))
   }
-  files.forEach(function(file) {
-    if (file.indexOf('.actual') !== -1) {
-      fs.unlink(`${basePath}/${file}`)
-    }
-    if (file.indexOf('.expected') === -1 && file.indexOf('.actual') === -1) {
-      fs.readFile(`${basePath}/${file}`, 'utf8', (err, data) => {
-        if (err) {
-          throw new Error(err)
-        }
-        useFileData(data, file)
-      })
+  files.forEach(function (file) {
+    // Ignore any critical.css file(s) already written
+    if (file !== 'critical.css') {
+      if (file.indexOf('.actual') !== -1) {
+        fs.unlink(`${basePath}/${file}`, (err) => {
+          if (err) { throw new Error(err) }
+        })
+      }
+      if (file.indexOf('.expected') === -1 && file.indexOf('.actual') === -1) {
+        fs.readFile(`${basePath}/${file}`, 'utf8', (err, data) => {
+          if (err) {
+            throw new Error(err)
+          }
+          useFileData(data, file)
+        })
+      }
     }
   })
 }