Merge pull request #37 from cburgmer/jasmine2Fix

Jasmine2 fix
HumbleSoftware · Jun 13, 2014 · a338c2f · a338c2f
2 parents a2c2ecd + 9f45dfc
commit a338c2f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 32 deletions.
diff --git a/js/imagediff.js b/js/imagediff.js
@@ -274,37 +274,35 @@
   }
 
   function imageDiffEqualMessage (actual, expected) {
-    return function () {
-      var
-        div     = get('div'),
-        a       = get('div', '<div>Actual:</div>'),
-        b       = get('div', '<div>Expected:</div>'),
-        c       = get('div', '<div>Diff:</div>'),
-        diff    = imagediff.diff(actual, expected),
-        canvas  = getCanvas(),
-        context;
-
-      canvas.height = diff.height;
-      canvas.width  = diff.width;
-
-      div.style.overflow = 'hidden';
-      a.style.float = 'left';
-      b.style.float = 'left';
-      c.style.float = 'left';
-
-      context = canvas.getContext('2d');
-      context.putImageData(diff, 0, 0);
-
-      a.appendChild(toCanvas(actual));
-      b.appendChild(toCanvas(expected));
-      c.appendChild(canvas);
-
-      div.appendChild(a);
-      div.appendChild(b);
-      div.appendChild(c);
-
-      return div;
-    };
+    var
+      div     = get('div'),
+      a       = get('div', '<div>Actual:</div>'),
+      b       = get('div', '<div>Expected:</div>'),
+      c       = get('div', '<div>Diff:</div>'),
+      diff    = imagediff.diff(actual, expected),
+      canvas  = getCanvas(),
+      context;
+
+    canvas.height = diff.height;
+    canvas.width  = diff.width;
+
+    div.style.overflow = 'hidden';
+    a.style.float = 'left';
+    b.style.float = 'left';
+    c.style.float = 'left';
+
+    context = canvas.getContext('2d');
+    context.putImageData(diff, 0, 0);
+
+    a.appendChild(toCanvas(actual));
+    b.appendChild(toCanvas(expected));
+    c.appendChild(canvas);
+
+    div.appendChild(a);
+    div.appendChild(b);
+    div.appendChild(c);
+
+    return div;
   }
 
   jasmine = {

diff --git a/spec/ImageDiffSpec.js b/spec/ImageDiffSpec.js
@@ -567,7 +567,7 @@ describe('ImageUtils', function() {
             matcher = imagediff.jasmine.toImageDiffEqual(),
             message;
 
-          message = matcher.compare(imageB, imageC).message();
+          message = matcher.compare(imageB, imageC).message;
 
           expect(message.querySelectorAll('div div div')[0].textContent).toEqual('Actual:');
           expect(message.querySelectorAll('div div canvas')[0]).toImageDiffEqual(imageB);