Skip to content

Commit 8e6471a

Browse files
committed
Fixing up tests after change ngModel for #160
1 parent 1bc3214 commit 8e6471a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

test/page-object.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class Page {
5050

5151
// color picker elements
5252
this.color_picker = element(by.model('color'));
53-
this.input_field = element(by.model('AngularColorPickerController.ngModel'));
53+
this.input_field = element(by.model('AngularColorPickerController.internalNgModel'));
5454
this.color_picker_panel = element(by.css('.color-picker-panel'));
5555
this.swatch = element(by.css('.color-picker-swatch'));
5656
this.swatch_left = element(by.css('.color-picker-swatch-left'));

test/protractor-config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ var chrome_driver = null;
1212
for (var i = 0; i < files.length; i++) {
1313
if (/^selenium-server-standalone-[\d\.]+\.jar$/i.test(files[i])) {
1414
selenium_server_jar = files[i];
15-
} else if (/^chromedriver_[\d\.]+$/i.test(files[i])) {
15+
} else if (/^chromedriver_[\d\.]+$/i.test(files[i])) { // linux
16+
chrome_driver = files[i];
17+
} else if (/^chromedriver_[\d\.]+.exe$/i.test(files[i])) { // windows
1618
chrome_driver = files[i];
1719
}
1820
}

0 commit comments

Comments
 (0)