Add multiple test

Author: t32k

Gruntfile.js

@@ -22,26 +22,32 @@ module.exports = function(grunt) {
         jshintrc: '.jshintrc',
       },
     },
-
+    
     // Before generating any new files, remove any previously-created files.
     clean: {
       tests: ['test/fixtures/tmp_*.css'],
     },
 
     // Configuration to be run (and then tested).
     csscomb: {
-      default_option: {
+      main: {
         files: {
           'test/fixtures/tmp_resort.css': ['test/fixtures/style.css'],
         }
       },
-      sort_option: {
+      custom: {
         options: {
           sortOrder: 'test/fixtures/sort.json'
         },
         files: {
           'test/fixtures/tmp_customsort.css': ['test/fixtures/style.css'],
         }
+      },
+      multiple: {
+        files: {
+          'test/fixtures/tmp_multi1.css': ['test/fixtures/multi1.css'],
+          'test/fixtures/tmp_multi2.css': ['test/fixtures/multi2.css'],
+        }
       }
     },
 

README.md

@@ -76,6 +76,7 @@ grunt.initConfig({
 
 ## Release History
 
++ v0.5.0: Add error handling.
 + v0.4.0: Move to csscomb's repository.
 + v0.3.0: Fix sort option bug.
 + v0.2.0: Fix bugs.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-csscomb",
   "description": "The grunt plugin for sorting CSS properties in specific order.",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "homepage": "https://github.com/csscomb/grunt-csscomb",
   "author": {
     "name": "Koji Ishimoto",

tasks/csscomb.js

@@ -10,17 +10,19 @@ module.exports = function(grunt) {
 
   grunt.registerMultiTask('csscomb', 'Sorting CSS properties in specific order.', function() {
     var fs = require('fs'),
-      path = require('path'),
-      exec = require('child_process').exec;
-    var done = this.async(),
-      realPath = path.dirname(fs.realpathSync(__filename)),
-      cssComb = 'php ' + realPath + '/lib/csscomb.php',
-      fileSrc = '',
-      fileDest = '',
-      fileSort = '',
-      options = this.options({
-        sortOrder: null
-      });
+        path = require('path'),
+        exec = require('child_process').exec;
+    var command,
+        done = this.async(),
+        realPath = path.dirname(fs.realpathSync(__filename)),
+        cssComb = 'php ' + realPath + '/lib/csscomb.php',
+        fileSrc = '',
+        fileDest = '',
+        fileSort = '',
+        options = this.options({
+          sortOrder: null
+        });
+
     if (options.sortOrder !== null) {
       if (grunt.file.exists(options.sortOrder)) {
         fileSort = ' -s ' + options.sortOrder;
@@ -33,6 +35,7 @@ module.exports = function(grunt) {
     function puts(error, stdout, stderr) {
       if (error !== null) {
         grunt.log.error(error);
+
       } else {
         grunt.log.ok(stdout);
       }
@@ -54,10 +57,10 @@ module.exports = function(grunt) {
       if (file.dest !== null) {
         fileDest = ' -o ' + file.dest;
       }
-      var command = cssComb + fileSort + fileSrc + fileDest;
+      command = cssComb + fileSort + fileSrc + fileDest;
       exec(command, puts);
-      // grunt.log.writeln('`' + command + '` was initiated.');
+      grunt.verbose.writeln('`' + command + '` was initiated.');
     });
+                
   });
-
 };

test/csscomb_test.js

@@ -2,32 +2,8 @@
 
 var grunt = require('grunt');
 
-/*
-  ======== A Handy Little Nodeunit Reference ========
-  https://github.com/caolan/nodeunit
-
-  Test methods:
-    test.expect(numAssertions)
-    test.done()
-  Test assertions:
-    test.ok(value, [message])
-    test.equal(actual, expected, [message])
-    test.notEqual(actual, expected, [message])
-    test.deepEqual(actual, expected, [message])
-    test.notDeepEqual(actual, expected, [message])
-    test.strictEqual(actual, expected, [message])
-    test.notStrictEqual(actual, expected, [message])
-    test.throws(block, [error], [message])
-    test.doesNotThrow(block, [error], [message])
-    test.ifError(value)
-*/
-
 exports.csscomb = {
-  setUp: function(done) {
-    // setup here if necessary
-    done();
-  },
-  default_option: function(test) {
+  main: function(test) {
     test.expect(1);
 
     var actual = grunt.file.read('test/fixtures/tmp_resort.css');
@@ -36,13 +12,26 @@ exports.csscomb = {
 
     test.done();
   },
-  sort_option: function(test) {
+  custom: function(test) {
     test.expect(1);
 
     var actual = grunt.file.read('test/fixtures/tmp_customsort.css');
     var expected = grunt.file.read('test/expected/customsort.css');
     test.equal(actual, expected, 'sholud be custom sorted.');
 
+    test.done();
+  },
+  mutiple: function(test) {
+    test.expect(2);
+
+    var actual = grunt.file.read('test/fixtures/tmp_multi1.css');
+    var expected = grunt.file.read('test/expected/multi1.css');
+    test.equal(actual, expected, 'sholud be sorted.');
+
+    var actual2 = grunt.file.read('test/fixtures/tmp_multi2.css');
+    var expected2 = grunt.file.read('test/expected/multi2.css');
+    test.equal(actual2, expected2, 'sholud be sorted.');
+
     test.done();
   }
 };