fix issue where ElementFinder.then does not return a promise

See #1152
angular · Aug 5, 2014 · d15d35a · d15d35a
1 parent 316961c
commit d15d35a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/protractor.js b/lib/protractor.js
@@ -744,7 +744,7 @@ var buildElementHelper = function(ptor) {
     if (this.opt_actionResult_) {
       return this.opt_actionResult_.then(fn, errorFn);
     } else {
-      return fn(this);
+      return webdriver.promise.fulfilled(fn(this));
     }
   };
 

diff --git a/spec/basic/elements_spec.js b/spec/basic/elements_spec.js
@@ -305,6 +305,12 @@ describe('ElementFinder', function() {
     });
     expect(successful).toEqual(false);
   });
+
+  it('should always return a promise when calling then', function() {
+    browser.get('index.html#/form');
+    var e1 = element(by.tagName('body')).then(function(){});
+    expect(e1 instanceof protractor.promise.Promise).toBe(true);
+  });
 });
 
 describe('evaluating statements', function() {