feat(clientsidescripts): better error reporting from testForAngular and waitForAngular

Author: David Simon

Diff for: lib/clientsidescripts.js

@@ -18,8 +18,12 @@ var clientSideScripts = exports;
 clientSideScripts.waitForAngular = function() {
   var el = document.querySelector(arguments[0]);
   var callback = arguments[1];
-  angular.element(el).injector().get('$browser').
-      notifyWhenNoOutstandingRequests(callback);
+  try {
+    angular.element(el).injector().get('$browser').
+        notifyWhenNoOutstandingRequests(callback);
+  } catch (e) {
+    callback(e.toString());
+  }
 };
 
 /**
@@ -378,12 +382,16 @@ clientSideScripts.testForAngular = function() {
   var attempts = arguments[0];
   var callback = arguments[arguments.length - 1];
   var check = function(n) {
-    if (window.angular && window.angular.resumeBootstrap) {
-      callback(true);
-    } else if (n < 1) {
-      callback(false);
-    } else {
-      window.setTimeout(function() {check(n - 1)}, 1000);
+    try {
+      if (window.angular && window.angular.resumeBootstrap) {
+        callback([true, null]);
+      } else if (n < 1) {
+        callback([false, "timeout exceeded"]);
+      } else {
+        window.setTimeout(function() {check(n - 1)}, 1000);
+      }
+    } catch (e) {
+      callback([false, e.toString()]);
     }
   };
   check(attempts);

Diff for: lib/protractor.js

@@ -245,14 +245,19 @@ Protractor.prototype.waitForAngular = function() {
     return webdriver.promise.fulfilled();
   }
   return this.driver.executeAsyncScript(
-      clientSideScripts.waitForAngular, this.rootEl).then(null, function(err) {
-        if (!/asynchronous script timeout/.test(err.message)) {
-          throw err;
-        }
-        var timeout = /[\d\.]*\ seconds/.exec(err.message);
-        throw 'Timed out waiting for Protractor to synchronize with ' +
-              'the page after ' + timeout;
-      });
+    clientSideScripts.waitForAngular, this.rootEl).then(function(err) {
+      if (err) {
+        throw 'Error while waiting for Protractor to ' +
+              'sync with the page: ' + JSON.stringify(err);
+      }
+    }).then(null, function(err) {
+      if (!/asynchronous script timeout/.test(err.message)) {
+        throw err;
+      }
+      var timeout = /[\d\.]*\ seconds/.exec(err.message);
+      throw 'Timed out waiting for Protractor to synchronize with ' +
+            'the page after ' + timeout;
+    });
 };
 
 // TODO: activeelement also returns a WebElement.
@@ -477,10 +482,12 @@ Protractor.prototype.get = function(destination) {
 
   // Make sure the page is an Angular page.
   this.driver.executeAsyncScript(clientSideScripts.testForAngular, 10).
-    then(function(hasAngular) {
+    then(function(arr) {
+      var hasAngular = arr[0];
       if (!hasAngular) {
+        var message = arr[1];
         throw new Error('Angular could not be found on the page ' +
-            destination);
+            destination + " : " + message);
       }
     });