fix(expectation): expectations without promises no longer add to task queue

Instead, expectations without promises in either expected or actual
are unchanged from the original Jasmine implementation.

See angular/protractor#2894

Author: juliemr

index.js

@@ -153,6 +153,8 @@ global.expect = function(actual) {
   return originalExpect(actual);
 };
 
+var originalWrapCompare = jasmine.Expectation.prototype.wrapCompare;
+
 /**
  * Creates a matcher wrapper that resolves any promises given for actual and
  * expected values, as well as the `pass` property of the result.
@@ -165,11 +167,16 @@ jasmine.Expectation.prototype.wrapCompare = function(name, matcherFactory) {
 
     matchError.stack = matchError.stack.replace(/ +at.+jasminewd.+\n/, '');
 
-    webdriver.promise.when(expectation.actual).then(function(actual) {
-      return webdriver.promise.all(expected).then(function(expected) {
-        return compare(actual, expected);
+    if (!webdriver.promise.isPromise(expectation.actual) &&
+        !webdriver.promise.isPromise(expected)) {
+      originalWrapCompare(name, matcherFactory).apply(this, arguments);
+    } else {
+      webdriver.promise.when(expectation.actual).then(function(actual) {
+        return webdriver.promise.all(expected).then(function(expected) {
+          return compare(actual, expected);
+        });
       });
-    });
+    }
 
     function compare(actual, expected) {
       var args = expected.slice(0);

package.json

@@ -13,8 +13,8 @@
   "author": "Julie Ralph <[email protected]>",
   "devDependencies": {
     "jshint": "2.5.0",
-    "jasmine": "2.3.2",
-    "selenium-webdriver": "2.47.0"
+    "jasmine": "2.4.1",
+    "selenium-webdriver": "2.48.2"
   },
   "repository": {
     "type": "git",

scripts/test.sh

@@ -9,7 +9,7 @@ $CMD
 [ "$?" -eq 0 ] || exit 1
 echo
 
-EXPECTED_RESULTS="15 specs, 14 failures"
+EXPECTED_RESULTS="16 specs, 15 failures"
 echo "### running failing specs (expecting $EXPECTED_RESULTS)"
 CMD=$CMD_BASE$FAILING_SPECS
 echo "### $CMD"

spec/errorSpec.js

@@ -34,9 +34,15 @@ describe('things that should fail', function() {
     done.fail('an error from done.fail');
   });
 
+  it('should error asynchronously in promise callbacks', function() {
+    fakeDriver.sleep(50).then(function() {
+      expect(true).toEqual(false);
+    });
+  });
+
   it('should error asynchronously within done callback', function(done) {
     setTimeout(function() {
-      expect(false).toBeTruthy();
+      expect(false).toEqual(true);
       done();
     }, 200);
   });