Whitespace and fixed array_fill_keys#0 by using equal()

kvz · kvz · commit 05292384f9c5 · 2014-01-05T23:57:05.000+01:00
Won't use node's standard assert.deepEqual cause that would
rule out in-browser tests
diff --git a/functions/array/array_count_values.js b/functions/array/array_count_values.js
@@ -12,6 +12,7 @@ function array_count_values (array) {
   // *     returns 2: {3:2, 5:1, "foo":2, "bar":1}
   // *     example 3: array_count_values([ true, 4.2, 42, "fubar" ]);
   // *     returns 3: {42:1, "fubar":1}
+
   var tmp_arr = {},
     key = '',
     t = '';
@@ -50,5 +51,6 @@ function array_count_values (array) {
       }
     }
   }
+
   return tmp_arr;
 }
diff --git a/functions/array/array_fill_keys.js b/functions/array/array_fill_keys.js
@@ -5,6 +5,7 @@ function array_fill_keys (keys, value) {
   // *     example 1: keys = {'a': 'foo', 2: 5, 3: 10, 4: 'bar'}
   // *     example 1: array_fill_keys(keys, 'banana')
   // *     returns 1: {"foo": "banana", 5: "banana", 10: "banana", "bar": "banana"}
+
   var retObj = {},
     key = '';
 
diff --git a/tests/cli.js b/tests/cli.js
@@ -3,9 +3,12 @@ var FS        = require('fs');
 var glob      = require('glob');
 var path      = require('path');
 var phpjsutil = new require('./phpjsutil');
+var equal     = require('deep-equal');
+
 
 var PhpjsUtil = phpjsutil({
-  injectDependencies: [ 'ini_set', 'ini_get' ]
+  injectDependencies: [ 'ini_set', 'ini_get' ],
+  equal: equal
 });
 
 // Environment-specific file opener. function name needs to
diff --git a/tests/package.json b/tests/package.json
@@ -10,7 +10,8 @@
   "dependencies": {
     "cli": "~0.4.4-2",
     "glob": "~3.2.1",
-    "send": "~0.1.0"
+    "send": "~0.1.0",
+    "deep-equal": "~0.1.2"
   },
   "keywords": [
     "cli",
diff --git a/tests/phpjsutil.js b/tests/phpjsutil.js
@@ -7,6 +7,7 @@ if (typeof require !== 'undefined') {
 
 function PhpjsUtil(config) {
   this.injectDependencies = [];
+  this.equal;
 
   // Overwrite properties with config
   for (var k in config) {
@@ -288,7 +289,9 @@ PhpjsUtil.prototype.test = function(params, cb) {
       var jsonExpected = JSON.stringify(test.expected, undefined, 2);
       var jsonResult   = JSON.stringify(test.result, undefined, 2);
 
-      if (jsonExpected !== jsonResult) {
+      // We cannot compare using the JSON.stringify as object order is
+      // not guaranteed
+      if (!self.equal(test.expected, test.result)) {
         err = 'expected: \n' + jsonExpected + '\n\n' +
               'returned: \n' + jsonResult + '\n';
         cb(err, test, params);

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ function array_count_values (array) {`
`12`	`12`	`// * returns 2: {3:2, 5:1, "foo":2, "bar":1}`
`13`	`13`	`// * example 3: array_count_values([ true, 4.2, 42, "fubar" ]);`
`14`	`14`	`// * returns 3: {42:1, "fubar":1}`
	`15`	`+`
`15`	`16`	`var tmp_arr = {},`
`16`	`17`	`key = '',`
`17`	`18`	`t = '';`
`@@ -50,5 +51,6 @@ function array_count_values (array) {`
`50`	`51`	`}`
`51`	`52`	`}`
`52`	`53`	`}`
	`54`	`+`
`53`	`55`	`return tmp_arr;`
`54`	`56`	`}`