Skip to content

Commit 8c5ee16

Browse files
committed
try using ES6 Promise
1 parent 325218c commit 8c5ee16

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

tools/gulp/tasks/screenshots.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ task('screenshots', () => {
2828
});
2929

3030
function updateFileResult(database: admin.database.Database, prNumber: string,
31-
filenameKey: string, result: boolean): admin.Promise<void>{
31+
filenameKey: string, result: boolean) {
3232
return database.ref(FIREBASE_REPORT).child(prNumber).child('results').child(filenameKey).set(result);
3333
}
3434

@@ -38,7 +38,7 @@ function updateResult(database: admin.database.Database, prNumber: string,
3838
}
3939

4040
function updateTravis(database: admin.database.Database,
41-
prNumber: string): admin.Promise<void> {
41+
prNumber: string) {
4242
return database.ref(FIREBASE_REPORT).child(prNumber).update({
4343
commit: process.env['TRAVIS_COMMIT'],
4444
sha: process.env['TRAVIS_PULL_REQUEST_SHA'],
@@ -47,7 +47,7 @@ function updateTravis(database: admin.database.Database,
4747
}
4848

4949
/** Get a list of filenames from firebase database. */
50-
function getScreenshotFiles(database: admin.database.Database): admin.Promise<any[]> {
50+
function getScreenshotFiles(database: admin.database.Database): Promise<any[]> {
5151
let bucket = openScreenshotsBucket();
5252
return bucket.getFiles({ prefix: 'golds/' }).then(function(data: any) {
5353
return data[0].filter((file:any) => file.name.endsWith('.screenshot.png'));
@@ -76,26 +76,26 @@ function getLocalScreenshotFiles(dir: string): string[] {
7676
function uploadScreenshots(prNumber?: string, mode?: 'test' | 'diff') {
7777
let bucket = openScreenshotsBucket();
7878

79-
let promises: admin.Promise<void>[] = [];
79+
let promises: Promise<void>[] = [];
8080
let localDir = mode == 'diff' ? path.join(SCREENSHOT_DIR, 'diff') : SCREENSHOT_DIR;
8181
getLocalScreenshotFiles(localDir).forEach((file: string) => {
8282
let fileName = path.join(localDir, file);
8383
let destination = (mode == null || !prNumber) ?
8484
`golds/${file}` : `screenshots/${prNumber}/${mode}/${file}`;
8585
promises.push(bucket.upload(fileName, { destination: destination }));
8686
});
87-
return admin.Promise.all(promises);
87+
return Promise.all(promises);
8888
}
8989

9090
/** Download golds screenshots. */
9191
function downloadAllGoldsAndCompare(
9292
files: any[], database: admin.database.Database,
93-
prNumber: string): admin.Promise<boolean> {
93+
prNumber: string): Promise<boolean> {
9494

9595
mkdirp(path.join(SCREENSHOT_DIR, `golds`));
9696
mkdirp(path.join(SCREENSHOT_DIR, `diff`));
9797

98-
return admin.Promise.all(files.map((file: any) => {
98+
return Promise.all(files.map((file: any) => {
9999
return downloadGold(file).then(() => diffScreenshot(file.name, database, prNumber));
100100
})).then((results: boolean[]) => results.every((value: boolean) => value == true));
101101
}
@@ -108,7 +108,7 @@ function downloadGold(file: any): Promise<void> {
108108
}
109109

110110
function diffScreenshot(filename: string, database: admin.database.Database,
111-
prNumber: string): admin.Promise<boolean> {
111+
prNumber: string) {
112112
// TODO(tinayuangao): Run the downloads and diffs in parallel.
113113
filename = path.basename(filename);
114114
let goldUrl = path.join(SCREENSHOT_DIR, `golds`, filename);
@@ -117,7 +117,7 @@ function diffScreenshot(filename: string, database: admin.database.Database,
117117
let filenameKey = extractScreenshotName(filename);
118118

119119
if (existsSync(goldUrl) && existsSync(pullRequestUrl)) {
120-
return new admin.Promise((resolve: any, reject: any) => {
120+
return new Promise((resolve: any, reject: any) => {
121121
imageDiff({
122122
actualImage: pullRequestUrl,
123123
expectedImage: goldUrl,

tools/gulp/util-functions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const request = require('request');
2-
import * as admin from 'firebase-admin';
32

43
/** Update github pr status to success/failure */
54
export function updateGithubStatus(result: boolean, prNumber: string) {
@@ -21,7 +20,7 @@ export function updateGithubStatus(result: boolean, prNumber: string) {
2120
'Content-Length': Buffer.byteLength(data)
2221
};
2322

24-
return new admin.Promise((resolve, reject) => {
23+
return new Promise((resolve, reject) => {
2524
request({
2625
url: `https://api.github.com/repos/angular/material2/statuses/${sha}`,
2726
method: 'POST',

0 commit comments

Comments
 (0)