Merge pull request #150 from kizu/integral-test-fix

Fixing the detection integral tests

Author: mishanga

test/mocha.js

@@ -58,9 +58,28 @@ mocha.suite.beforeEach(function() {
      * @param {Object} expected Expected config with detected options
      */
     this.shouldDetect = function(options, input, expected) {
+        // We need to “sort” the input and expected objects, as their order may vary
+        function sortObject(o) {
+            var sorted = {};
+            var key = [];
+            var a = [];
+
+            for (key in o) {
+                if (o.hasOwnProperty(key)) {
+                    a.push(key);
+                }
+            }
+
+            a.sort();
+
+            for (key = 0; key < a.length; key++) {
+                sorted[a[key]] = o[a[key]];
+            }
+            return sorted;
+        }
         assert.equal(
-            JSON.stringify(this.comb.detectInString(input, options)),
-            JSON.stringify(expected)
+            JSON.stringify(sortObject(this.comb.detectInString(input, options))),
+            JSON.stringify(sortObject(expected))
         );
     };
 });

test/options/integral.js

@@ -11,32 +11,12 @@ describe('integral test', function() {
         this.shouldBeEqual('integral.css', 'integral.expected.css');
     });
 
-    it.skip('Should detect everything in integral test', function(done) {
-        var config = this.comb.getConfig('csscomb');
-        var input = this.readFile('integral.css');
-        var expected = {
-            'remove-empty-rulesets': true,
-            'always-semicolon': true,
-            'color-case': 'lower',
-            'color-shorthand': true,
-            'element-case': 'lower',
-            'leading-zero': false,
-            quotes: 'single',
-            'strip-spaces': true,
-            'eof-newline': true,
-            'stick-brace': '\n',
-            'colon-space': ['', ' '],
-            'combinator-space': [' ', ' '],
-            'rule-indent': '    ',
-            'block-indent': '    ',
-            'unitless-zero': true,
-            'vendor-prefix-align': true
-        };
-
+    it('Should detect everything in integral test', function() {
+        var input = this.readFile('integral.expected.css');
+        // Clone the required config object, otherwise other tests would fail
+        var expected = JSON.parse(JSON.stringify(this.comb.getConfig('csscomb')));
+        delete expected['sort-order'];
+        delete expected['exclude'];
         this.shouldDetect(undefined, input, expected);
-
-        expected['sort-order'] = config['sort-order'];
-        this.comb.configure(expected);
-        this.shouldDetect(undefined, 'integral.css', expected);
     });
 });