fix(error message): do not crash of thrown error has made stack rea…

…donly (#3372)
angular · Jul 19, 2016 · ee038f9 · ee038f9
1 parent 7c285dc
commit ee038f9
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/lib/element.ts b/lib/element.ts
@@ -429,16 +429,23 @@ export class ElementArrayFinder extends WebdriverWebElement {
    */
   applyAction_(actionFn: Function): ElementArrayFinder {
     let callerError = new Error();
-    let actionResults = this.getWebElements()
-                            .then((arr: any) => {
-                              return webdriver.promise.all(arr.map(actionFn));
-                            })
-                            .then(null, (e: Error) => {
-                              let noSuchErr = (e as any);
-                              noSuchErr.stack =
-                                  noSuchErr.stack + (callerError as any).stack;
-                              throw noSuchErr;
-                            });
+    let actionResults =
+        this.getWebElements()
+            .then((arr: any) => {
+              return webdriver.promise.all(arr.map(actionFn));
+            })
+            .then(null, (e: Error) => {
+              let noSuchErr: any;
+              let stack: string;
+              if (e instanceof Error) {
+                noSuchErr = (e as any)
+                noSuchErr.stack = noSuchErr.stack + (callerError as any).stack;
+              } else {
+                noSuchErr = (new Error(e.toString()) as any);
+                noSuchErr.stack = (callerError as any).stack;
+              }
+              throw noSuchErr;
+            });
     return new ElementArrayFinder(
         this.browser_, this.getWebElements, this.locator_, actionResults);
   }