@@ -28,7 +28,7 @@ task('screenshots', () => {
28
28
} ) ;
29
29
30
30
function updateFileResult ( database : admin . database . Database , prNumber : string ,
31
- filenameKey : string , result : boolean ) : admin . Promise < void > {
31
+ filenameKey : string , result : boolean ) {
32
32
return database . ref ( FIREBASE_REPORT ) . child ( prNumber ) . child ( 'results' ) . child ( filenameKey ) . set ( result ) ;
33
33
}
34
34
@@ -38,7 +38,7 @@ function updateResult(database: admin.database.Database, prNumber: string,
38
38
}
39
39
40
40
function updateTravis ( database : admin . database . Database ,
41
- prNumber : string ) : admin . Promise < void > {
41
+ prNumber : string ) {
42
42
return database . ref ( FIREBASE_REPORT ) . child ( prNumber ) . update ( {
43
43
commit : process . env [ 'TRAVIS_COMMIT' ] ,
44
44
sha : process . env [ 'TRAVIS_PULL_REQUEST_SHA' ] ,
@@ -47,7 +47,7 @@ function updateTravis(database: admin.database.Database,
47
47
}
48
48
49
49
/** 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 [ ] > {
51
51
let bucket = openScreenshotsBucket ( ) ;
52
52
return bucket . getFiles ( { prefix : 'golds/' } ) . then ( function ( data : any ) {
53
53
return data [ 0 ] . filter ( ( file :any ) => file . name . endsWith ( '.screenshot.png' ) ) ;
@@ -76,26 +76,26 @@ function getLocalScreenshotFiles(dir: string): string[] {
76
76
function uploadScreenshots ( prNumber ?: string , mode ?: 'test' | 'diff' ) {
77
77
let bucket = openScreenshotsBucket ( ) ;
78
78
79
- let promises : admin . Promise < void > [ ] = [ ] ;
79
+ let promises : Promise < void > [ ] = [ ] ;
80
80
let localDir = mode == 'diff' ? path . join ( SCREENSHOT_DIR , 'diff' ) : SCREENSHOT_DIR ;
81
81
getLocalScreenshotFiles ( localDir ) . forEach ( ( file : string ) => {
82
82
let fileName = path . join ( localDir , file ) ;
83
83
let destination = ( mode == null || ! prNumber ) ?
84
84
`golds/${ file } ` : `screenshots/${ prNumber } /${ mode } /${ file } ` ;
85
85
promises . push ( bucket . upload ( fileName , { destination : destination } ) ) ;
86
86
} ) ;
87
- return admin . Promise . all ( promises ) ;
87
+ return Promise . all ( promises ) ;
88
88
}
89
89
90
90
/** Download golds screenshots. */
91
91
function downloadAllGoldsAndCompare (
92
92
files : any [ ] , database : admin . database . Database ,
93
- prNumber : string ) : admin . Promise < boolean > {
93
+ prNumber : string ) : Promise < boolean > {
94
94
95
95
mkdirp ( path . join ( SCREENSHOT_DIR , `golds` ) ) ;
96
96
mkdirp ( path . join ( SCREENSHOT_DIR , `diff` ) ) ;
97
97
98
- return admin . Promise . all ( files . map ( ( file : any ) => {
98
+ return Promise . all ( files . map ( ( file : any ) => {
99
99
return downloadGold ( file ) . then ( ( ) => diffScreenshot ( file . name , database , prNumber ) ) ;
100
100
} ) ) . then ( ( results : boolean [ ] ) => results . every ( ( value : boolean ) => value == true ) ) ;
101
101
}
@@ -108,7 +108,7 @@ function downloadGold(file: any): Promise<void> {
108
108
}
109
109
110
110
function diffScreenshot ( filename : string , database : admin . database . Database ,
111
- prNumber : string ) : admin . Promise < boolean > {
111
+ prNumber : string ) {
112
112
// TODO(tinayuangao): Run the downloads and diffs in parallel.
113
113
filename = path . basename ( filename ) ;
114
114
let goldUrl = path . join ( SCREENSHOT_DIR , `golds` , filename ) ;
@@ -117,7 +117,7 @@ function diffScreenshot(filename: string, database: admin.database.Database,
117
117
let filenameKey = extractScreenshotName ( filename ) ;
118
118
119
119
if ( existsSync ( goldUrl ) && existsSync ( pullRequestUrl ) ) {
120
- return new admin . Promise ( ( resolve : any , reject : any ) => {
120
+ return new Promise ( ( resolve : any , reject : any ) => {
121
121
imageDiff ( {
122
122
actualImage : pullRequestUrl ,
123
123
expectedImage : goldUrl ,
0 commit comments