Merge pull request #24 from suitcss/improve-tests

Improve tests

Author: simonsmith

.travis.yml

@@ -2,3 +2,5 @@ language: node_js
 sudo: false
 node_js:
   - "0.12"
+  - "4"
+  - "5"

lib/index.js

@@ -99,7 +99,7 @@ function mergeOptions(options) {
     if (typeof beforeLint === 'function') {
       css = beforeLint(css, filename, merged);
     }
-    return lintImportedFiles(merged)(css, filename);
+    return lintImportedFiles(merged, css, filename);
   };
 
   // Allow additional plugins to be merged with the defaults
@@ -119,18 +119,16 @@ function mergeOptions(options) {
  * @param {Object} options
  * @returns {Function} Used by postcss-import transform
  */
-function lintImportedFiles(options) {
-  return function(css, filename) {
-    var processor = postcss();
+function lintImportedFiles(options, css, filename) {
+  var processor = postcss();
 
-    if (options.lint) {
-      processor.use(stylelint(options.stylelint));
-    }
+  if (options.lint) {
+    processor.use(stylelint(options.stylelint));
+  }
 
-    processor
-      .use(bemLinter(options['postcss-bem-linter']))
-      .use(reporter(options['postcss-reporter']));
+  processor
+  .use(bemLinter(options['postcss-bem-linter']))
+  .use(reporter(options['postcss-reporter']));
 
-    return processor.process(css, {from: filename}).css;
-  };
+  return processor.process(css, {from: filename}).css;
 }

package.json

@@ -39,10 +39,11 @@
     "postcss-property-lookup": "^1.1.4",
     "rewire": "^2.5.1",
     "sinon": "^1.17.2",
+    "sinon-chai": "^2.8.0",
     "stylelint-config-suitcss": "^1.0.0"
   },
   "scripts": {
-    "test": "npm run lint && mocha --reporter spec --slow 400",
+    "test": "npm run lint && mocha --reporter spec --slow 400 --timeout 3000",
     "lint": "eslint lib/index.js test/test.js bin/suitcss",
     "watch": "mocha --watch --reporter spec --slow 400"
   },

test/test.js

@@ -1,11 +1,15 @@
-var expect = require('chai').expect;
+var chai = require('chai');
 var sinon = require('sinon');
 var child = require('child_process');
 var exec = child.exec;
 var fs = require('fs');
 var rewire = require('rewire');
 var suitcss = rewire('../lib');
 var path = require('path');
+var sinonChai = require('sinon-chai');
+
+chai.use(sinonChai);
+var expect = chai.expect;
 
 /**
  * Node API tests.
@@ -56,7 +60,7 @@ describe('suitcss', function() {
       expect(opts.lint).to.be.true;
     });
 
-    it('should allow an minify option to be set', function() {
+    it('should allow a minify option to be set', function() {
       var opts = mergeOptions({minify: true});
       expect(opts.minify).to.be.true;
     });
@@ -148,7 +152,7 @@ describe('suitcss', function() {
 
     describe('stylelint', function() {
       it('should check the input conforms to SUIT style rules', function(done) {
-        suitcss('@import ./stylelint.css', {
+        suitcss('@import "./stylelint.css"', {
           lint: true,
           root: 'test/fixtures',
           'postcss-reporter': {
@@ -163,53 +167,50 @@ describe('suitcss', function() {
       });
     });
 
-    describe('beforeLint option', function() {
-      var lintImportedFilesStub, bemLintStub, beforeLintStub, revert;
+    describe('transforming css before linting', function() {
+      var lintImportedFilesStub, beforeLintStub, revert;
 
       beforeEach(function() {
-        lintImportedFilesStub = sinon.stub();
-        bemLintStub = sinon.stub().returns('/* lint */');
-        beforeLintStub = sinon.stub().returns('/* before lint */');
-
-        lintImportedFilesStub.onFirstCall().returns(bemLintStub);
+        lintImportedFilesStub = sinon.stub().returns('/*linting done*/');
+        beforeLintStub = sinon.stub().returns('/*before lint*/');
         revert = suitcss.__set__('lintImportedFiles', lintImportedFilesStub);
       });
 
       afterEach(function() {
         revert();
       });
 
-      it('should call user supplied function before linting', function(done) {
+      it('should call `beforeLint` function before linting', function(done) {
         suitcss(read('fixtures/component'), {
           root: 'test/fixtures',
           beforeLint: beforeLintStub
         }).catch(done);
 
-        expect(bemLintStub.calledOnce).to.be.ok;
-        expect(beforeLintStub.calledOnce).to.be.ok;
-        expect(beforeLintStub.calledBefore(bemLintStub)).to.be.ok;
+        expect(lintImportedFilesStub).to.be.calledOnce;
+        expect(beforeLintStub).to.be.calledOnce;
+        expect(beforeLintStub).to.have.been.calledBefore(lintImportedFilesStub);
 
         done();
       });
 
-      it('should pass processed CSS to the linting transform function', function(done) {
+      it('should pass the result of `beforeLint` to `lintImportedFiles`', function(done) {
         suitcss(read('fixtures/component'), {
           root: 'test/fixtures',
           beforeLint: beforeLintStub
         }).catch(done);
 
-        expect(bemLintStub.args[0][0]).to.equal('/* before lint */');
+        expect(lintImportedFilesStub.args[0][1]).to.equal('/*before lint*/');
 
         done();
       });
 
-      it('should pass the merged options to the beforeLint function', function(done) {
+      it('should pass the options object to the beforeLint function as the third parameter', function(done) {
         suitcss(read('fixtures/component'), {
           root: 'test/fixtures',
           beforeLint: beforeLintStub
         }).catch(done);
 
-        expect(beforeLintStub.args[0][2].root).to.equal('test/fixtures');
+        expect(beforeLintStub.args[0][2]).to.contain({root: 'test/fixtures'});
 
         done();
       });