Skip to content

Commit f5acad0

Browse files
kingcodykingcody
committedJul 23, 2015
fix(test): update protractor test for angular 1.4
·
v3.0.0-rc43.0.0-rc5
1 parent f4aaae0 commit f5acad0

9 files changed

+29
-23
lines changed
 

‎app/templates/e2e/account(auth)/login/login.spec(jasmine).js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('Login View', function() {
88
var page;
99

1010
var loadPage = function() {
11-
browser.get('/login');
11+
browser.get(config.baseUrl + '/login');
1212
page = require('./login.po');
1313
};
1414

@@ -45,7 +45,7 @@ describe('Login View', function() {
4545

4646
var navbar = require('../../components/navbar/navbar.po');
4747

48-
expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/');
48+
expect(browser.getCurrentUrl()).toBe(config.baseUrl + '/');
4949
expect(navbar.navbarAccountGreeting.getText()).toBe('Hello ' + testUser.name);
5050
});
5151

@@ -55,7 +55,7 @@ describe('Login View', function() {
5555
password: 'badPassword'
5656
});
5757

58-
expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/login');
58+
expect(browser.getCurrentUrl()).toBe(config.baseUrl + '/login');
5959

6060
var helpBlock = page.form.element(by.css('.form-group.has-error .help-block.ng-binding'));
6161
expect(helpBlock.getText()).toBe('This password is not correct.');

‎app/templates/e2e/account(auth)/login/login.spec(mocha).js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('Login View', function() {
88
var page;
99

1010
var loadPage = function() {
11-
browser.get('/login');
11+
browser.get(config.baseUrl + '/login');
1212
page = require('./login.po');
1313
};
1414

@@ -50,7 +50,7 @@ describe('Login View', function() {
5050

5151
var navbar = require('../../components/navbar/navbar.po');
5252

53-
<%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/');
53+
<%= does("browser.getCurrentUrl()") %>.eventually.equal(config.baseUrl + '/');
5454
<%= does("navbar.navbarAccountGreeting.getText()") %>.eventually.equal('Hello ' + testUser.name);
5555
});
5656

@@ -65,7 +65,7 @@ describe('Login View', function() {
6565
password: 'badPassword'
6666
});
6767

68-
<%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/login');
68+
<%= does("browser.getCurrentUrl()") %>.eventually.equal(config.baseUrl + '/login');
6969

7070
var helpBlock = page.form.element(by.css('.form-group.has-error .help-block.ng-binding'));
7171
<%= does("helpBlock.getText()") %>.eventually.equal('This password is not correct.');

‎app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
66

77
describe('Logout View', function() {
88
var login = function(user) {
9-
browser.get('/login');
9+
browser.get(config.baseUrl + '/login');
1010
require('../login/login.po').login(user);
1111
};
1212

@@ -34,14 +34,14 @@ describe('Logout View', function() {
3434
it('should logout a user and redirecting to "/"', function() {
3535
var navbar = require('../../components/navbar/navbar.po');
3636

37-
expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/');
37+
expect(browser.getCurrentUrl()).toBe(config.baseUrl + '/');
3838
expect(navbar.navbarAccountGreeting.getText()).toBe('Hello ' + testUser.name);
3939

40-
browser.get('/logout');
40+
browser.get(config.baseUrl + '/logout');
4141

4242
navbar = require('../../components/navbar/navbar.po');
4343

44-
expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/');
44+
expect(browser.getCurrentUrl()).toBe(config.baseUrl + '/');
4545
expect(navbar.navbarAccountGreeting.isDisplayed()).toBe(false);
4646
});
4747

‎app/templates/e2e/account(auth)/logout/logout.spec(mocha).js

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var UserModel = require(config.serverConfig.root + '/server/sqldb').User;<% } %>
66

77
describe('Logout View', function() {
88
var login = function(user) {
9-
browser.get('/login');
9+
browser.get(config.baseUrl + '/login');
1010
require('../login/login.po').login(user);
1111
};
1212

@@ -39,14 +39,14 @@ describe('Logout View', function() {
3939
it('should logout a user and redirecting to "/"', function() {
4040
var navbar = require('../../components/navbar/navbar.po');
4141

42-
<%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/');
42+
<%= does("browser.getCurrentUrl()") %>.eventually.equal(config.baseUrl + '/');
4343
<%= does("navbar.navbarAccountGreeting.getText()") %>.eventually.equal('Hello ' + testUser.name);
4444

45-
browser.get('/logout');
45+
browser.get(config.baseUrl + '/logout');
4646

4747
navbar = require('../../components/navbar/navbar.po');
4848

49-
<%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/');
49+
<%= does("browser.getCurrentUrl()") %>.eventually.equal(config.baseUrl + '/');
5050
<%= does("navbar.navbarAccountGreeting.isDisplayed()") %>.eventually.equal(false);
5151
});
5252

‎app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ describe('Signup View', function() {
88
var page;
99

1010
var loadPage = function() {
11-
browser.get('/signup');
11+
browser.manage().deleteAllCookies();
12+
browser.get(config.baseUrl + '/signup');
1213
page = require('./signup.po');
1314
};
1415

@@ -45,14 +46,14 @@ describe('Signup View', function() {
4546

4647
var navbar = require('../../components/navbar/navbar.po');
4748

48-
expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/');
49+
expect(browser.getCurrentUrl()).toBe(config.baseUrl + '/');
4950
expect(navbar.navbarAccountGreeting.getText()).toBe('Hello ' + testUser.name);
5051
});
5152

5253
it('should indicate signup failures', function() {
5354
page.signup(testUser);
5455

55-
expect(browser.getLocationAbsUrl()).toBe(config.baseUrl + '/signup');
56+
expect(browser.getCurrentUrl()).toBe(config.baseUrl + '/signup');
5657
expect(page.form.email.getAttribute('class')).toContain('ng-invalid-mongoose');
5758

5859
var helpBlock = page.form.element(by.css('.form-group.has-error .help-block.ng-binding'));

‎app/templates/e2e/account(auth)/signup/signup.spec(mocha).js

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ describe('Signup View', function() {
88
var page;
99

1010
var loadPage = function() {
11-
browser.get('/signup');
11+
browser.manage().deleteAllCookies()
12+
browser.get(config.baseUrl + '/signup');
1213
page = require('./signup.po');
1314
};
1415

@@ -50,7 +51,7 @@ describe('Signup View', function() {
5051

5152
var navbar = require('../../components/navbar/navbar.po');
5253

53-
<%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/');
54+
<%= does("browser.getCurrentUrl()") %>.eventually.equal(config.baseUrl + '/');
5455
<%= does("navbar.navbarAccountGreeting.getText()") %>.eventually.equal('Hello ' + testUser.name);
5556
});
5657

@@ -62,7 +63,7 @@ describe('Signup View', function() {
6263
it('should indicate signup failures', function() {
6364
page.signup(testUser);
6465

65-
<%= does("browser.getLocationAbsUrl()") %>.eventually.equal(config.baseUrl + '/signup');
66+
<%= does("browser.getCurrentUrl()") %>.eventually.equal(config.baseUrl + '/signup');
6667
<%= does("page.form.email.getAttribute('class')") %>.eventually.contain('ng-invalid-mongoose');
6768

6869
var helpBlock = page.form.element(by.css('.form-group.has-error .help-block.ng-binding'));

‎app/templates/e2e/components/navbar/navbar.po.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var NavbarComponent = function() {
1010
this.navbarHeader = this.navbar.element(by.css('.navbar-header'));
1111
this.navbarNav = this.navbar.element(by.css('#navbar-main .nav.navbar-nav:not(.navbar-right)'));<% if (filters.auth) { %>
1212
this.navbarAccount = this.navbar.element(by.css('#navbar-main .nav.navbar-nav.navbar-right'));
13-
this.navbarAccountGreeting = this.navbarAccount.element(by.binding('Hello {{ getCurrentUser().name }}'));<% } %>
13+
this.navbarAccountGreeting = this.navbarAccount.element(by.binding('getCurrentUser().name'));<% } %>
1414
};
1515

1616
module.exports = new NavbarComponent();

‎app/templates/e2e/main/main.spec(jasmine).js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
'use strict';
22

3+
var config = browser.params;
4+
35
describe('Main View', function() {
46
var page;
57

68
beforeEach(function() {
7-
browser.get('/');
9+
browser.get(config.baseUrl + '/');
810
page = require('./main.po');
911
});
1012

‎app/templates/e2e/main/main.spec(mocha).js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
'use strict';
22

3+
var config = browser.params;
4+
35
describe('Main View', function() {
46
var page;
57

68
beforeEach(function() {
7-
browser.get('/');
9+
browser.get(config.baseUrl + '/');
810
page = require('./main.po');
911
});
1012

0 commit comments

Comments
 (0)