fix(plugins): do not force ManagedPromise in plugins.ts

angular · Jan 31, 2017 · 8d8f267 · 8d8f267
1 parent cd084a0
commit 8d8f267
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/plugins.ts b/lib/plugins.ts
@@ -4,6 +4,7 @@ import * as webdriver from 'selenium-webdriver';
 import {Config} from './config';
 import {ConfigParser} from './configParser';
 import {Logger} from './logger';
+import {protractor} from './ptor';
 
 let logger = new Logger('plugins');
 
@@ -456,8 +457,13 @@ export class Plugins {
         logError(e);
       }
     };
-    return promiseType == PromiseType.Q ? q.Promise(resolver) :
-                                          new webdriver.promise.Promise(resolver);
+    if (promiseType == PromiseType.Q) {
+      return q.Promise(resolver);
+    } else if (protractor.browsercontrolFlowIsEnabled()) {
+      return new webdriver.promise.Promise(resolver);
+    } else {
+      return new Promise(resolver);
+    }
   }
 
   /**