File tree 5 files changed +9
-14
lines changed
5 files changed +9
-14
lines changed Original file line number Diff line number Diff line change 33
33
npm-debug.log
34
34
testem.log
35
35
/.chrome
36
+ yarn.lock
Original file line number Diff line number Diff line change @@ -102,6 +102,6 @@ describe('dialog', () => {
102
102
103
103
// TODO(crisbeto): should be moved to a common util. copied from the menu e2e setup.
104
104
function expectFocusOn ( el : any ) : void {
105
- expect ( browser . driver . switchTo ( ) . activeElement ( ) . getInnerHtml ( ) ) . toBe ( el . getInnerHtml ( ) ) ;
105
+ expect ( browser . driver . switchTo ( ) . activeElement ( ) . getId ( ) ) . toBe ( el . getId ( ) ) ;
106
106
}
107
107
} ) ;
Original file line number Diff line number Diff line change @@ -39,8 +39,7 @@ export class MenuPage {
39
39
40
40
// TODO(kara): move to common testing utility
41
41
expectFocusOn ( el : any ) : void {
42
- expect ( browser . driver . switchTo ( ) . activeElement ( ) . getInnerHtml ( ) )
43
- . toBe ( el . getInnerHtml ( ) ) ;
42
+ expect ( browser . driver . switchTo ( ) . activeElement ( ) . getId ( ) ) . toBe ( el . getId ( ) ) ;
44
43
}
45
44
46
45
expectMenuPresent ( expected : boolean ) {
Original file line number Diff line number Diff line change 48
48
"@types/merge2" : " 0.0.28" ,
49
49
"@types/minimist" : " ^1.1.28" ,
50
50
"@types/node" : " ^6.0.34" ,
51
- "@types/protractor" : " ^4.0.0" ,
52
51
"@types/run-sequence" : " 0.0.27" ,
53
52
"@types/rx" : " ^2.5.33" ,
54
- "@types/selenium-webdriver" : " 2.53.36" ,
55
53
"axe-core" : " ^2.0.7" ,
56
- "axe-webdriverjs" : " ^0.4 .0" ,
54
+ "axe-webdriverjs" : " ^0.5 .0" ,
57
55
"conventional-changelog" : " ^1.1.0" ,
58
56
"dgeni" : " ^0.4.2" ,
59
57
"dgeni-packages" : " ^0.16.2" ,
91
89
"merge2" : " ^1.0.2" ,
92
90
"minimist" : " ^1.2.0" ,
93
91
"node-sass" : " ^3.4.2" ,
94
- "protractor" : " ^4 .0.8 " ,
92
+ "protractor" : " ^5 .0.0 " ,
95
93
"resolve-bin" : " ^0.4.0" ,
96
94
"run-sequence" : " ^1.2.2" ,
97
95
"sass" : " ^0.5.0" ,
98
- "selenium-webdriver" : " 2.53.3 " ,
96
+ "selenium-webdriver" : " ^3.0.1 " ,
99
97
"strip-ansi" : " ^3.0.0" ,
100
98
"stylelint" : " ^7.7.0" ,
101
99
"symlink-or-copy" : " ^1.0.1" ,
102
100
"travis-after-modes" : " 0.0.7" ,
103
- "ts-node" : " ^0.7.3 " ,
101
+ "ts-node" : " ^2.0.0 " ,
104
102
"tslint" : " ^3.13.0" ,
105
103
"typedoc" : " ^0.5.1" ,
106
104
"typescript" : " ~2.0.10" ,
Original file line number Diff line number Diff line change @@ -41,6 +41,8 @@ if (process.env['TRAVIS']) {
41
41
config . sauceKey = key ;
42
42
config . capabilities = {
43
43
'browserName' : 'chrome' ,
44
+ 'version' : 'latest' ,
45
+ "chromedriverVersion" : "2.26" ,
44
46
'tunnel-identifier' : process . env [ 'TRAVIS_JOB_ID' ] ,
45
47
'build' : process . env [ 'TRAVIS_JOB_ID' ] ,
46
48
'name' : 'Material 2 E2E Tests' ,
@@ -53,11 +55,6 @@ if (process.env['TRAVIS']) {
53
55
'recordVideo' : false ,
54
56
'recordScreenshots' : false
55
57
} ;
56
-
57
- // Because Protractor runs selenium instances concurrently in the CI and each instance
58
- // will create a bloat of logs we don't want to show any info messages.
59
- // Until protractor#1451 is solved, manually disable all info messages.
60
- require ( 'protractor/built/logger' ) . Logger . prototype . info = ( ) => { } ;
61
58
}
62
59
63
60
You can’t perform that action at this time.
0 commit comments