Skip to content

Commit 975f314

Browse files
sjelinigniteram
authored andcommitted
chore(wdpromise): prefer wdpromise.when to wdpromise.fulfilled (angular#4018)
Closes angular#3903
1 parent 52e7e89 commit 975f314

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

lib/browser.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
694694

695695
let runWaitForAngularScript: () => wdpromise.Promise<any> = () => {
696696
if (this.plugins_.skipAngularStability() || this.bpClient) {
697-
return wdpromise.fulfilled();
697+
return wdpromise.when(null);
698698
} else {
699699
// Need to wrap this so that we read rootEl in the control flow, not synchronously.
700700
return this.angularAppRoot().then((rootEl: string) => {
@@ -755,7 +755,7 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
755755
'return window.NG_PENDING_TIMEOUTS',
756756
'Protractor.waitForAngular() - getting pending timeouts' + description);
757757
} else {
758-
pendingTimeoutsPromise = wdpromise.fulfilled({});
758+
pendingTimeoutsPromise = wdpromise.when({});
759759
}
760760
let pendingHttpsPromise = this.executeScriptWithDescription(
761761
clientSideScripts.getPendingHttpRequests,
@@ -1209,7 +1209,7 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
12091209
pause(opt_debugPort?: number): wdpromise.Promise<any> {
12101210
if (this.debugHelper.isAttached()) {
12111211
logger.info('Encountered browser.pause(), but debugger already attached.');
1212-
return wdpromise.fulfilled(true);
1212+
return wdpromise.when(true);
12131213
}
12141214
let debuggerClientPath = __dirname + '/debugger/clients/wddebugger.js';
12151215
let onStartFn = (firstTime: boolean) => {

lib/debugger.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export class DebugHelper {
169169
res = 'Error while evaluating command: ' + e;
170170
}
171171
if (!wdpromise.isPromise(res)) {
172-
res = wdpromise.fulfilled(res);
172+
res = wdpromise.when(res);
173173
}
174174

175175
return res.then((res: any) => {
@@ -237,7 +237,7 @@ export class DebugHelper {
237237
*/
238238
private validatePortAvailability_(port: number): wdpromise.Promise<boolean> {
239239
if (this.debuggerValidated_) {
240-
return wdpromise.fulfilled(false);
240+
return wdpromise.when(false);
241241
}
242242

243243
let doneDeferred = wdpromise.defer();

lib/element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ export class ElementArrayFinder extends WebdriverWebElement {
689689
* value of the accumulator.
690690
*/
691691
reduce(reduceFn: Function, initialValue: any): wdpromise.Promise<any> {
692-
let valuePromise = wdpromise.fulfilled(initialValue);
692+
let valuePromise = wdpromise.when(initialValue);
693693
return this.asElementFinders_().then((arr: ElementFinder[]) => {
694694
return arr.reduce((valuePromise: any, elementFinder: ElementFinder, index: number) => {
695695
return valuePromise.then((value: any) => {
@@ -863,7 +863,7 @@ export class ElementFinder extends WebdriverWebElement {
863863
static fromWebElement_(browser: ProtractorBrowser, webElem: WebElement, locator?: Locator):
864864
ElementFinder {
865865
let getWebElements = () => {
866-
return wdpromise.fulfilled([webElem]);
866+
return wdpromise.when([webElem]);
867867
};
868868
return new ElementArrayFinder(browser, getWebElements, locator).toElementFinder_();
869869
}

lib/runner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export class Runner extends EventEmitter {
258258
});
259259

260260
browser_.getProcessedConfig = () => {
261-
return wdpromise.fulfilled(config);
261+
return wdpromise.when(config);
262262
};
263263

264264
browser_.forkNewDriverInstance = (opt_useSameUrl: boolean, opt_copyMockModules: boolean) => {

0 commit comments

Comments
 (0)