Merge remote branch 'origin/master'

dipspb · May 5, 2011 · 3ddfd06 · 3ddfd06
2 parents c95b774 + 1ff1244
commit 3ddfd06
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/test/lib/helpers.js b/test/lib/helpers.js
@@ -1,3 +1,6 @@
+// Let's be strict
+equals = strictEqual;
+
 function compareNumbers(number1, number2, message) {
 	if (number1 !== 0)
 		number1 = Math.round(number1 * 100) / 100;

diff --git a/test/tests/PathStyle.js b/test/tests/PathStyle.js
@@ -61,8 +61,8 @@ test('getting group styles', function() {
 	group.appendTop(secondPath);
 
 	// the group now contains two paths with different fillColors and therefore
-	// should return null:
-	equals(group.fillColor, null, 'group.fillColor');
+	// should return undefined:
+	equals(group.fillColor, undefined, 'group.fillColor');
 
 	//If we remove the first path, it should now return 'black':
 	group.children[0].remove();