Skip to content

Commit 852e394

Browse files
authored
chore(package): update ember-cli-page-object to version 1.14.1 (#1709)
Closes #1227 - perform package update - clear out deprecations
1 parent db333c8 commit 852e394

File tree

221 files changed

+2091
-2155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+2091
-2155
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"ember-cli-mirage": "^0.3.4",
5151
"ember-cli-moment-shim": "^3.4.0",
5252
"ember-cli-neat": "^0.0.6",
53-
"ember-cli-page-object": "1.13.0",
53+
"ember-cli-page-object": "1.14.1",
5454
"ember-cli-password-strength": "^2.0.0",
5555
"ember-cli-qunit": "^4.1.1",
5656
"ember-cli-release": "^0.2.9",

tests/acceptance/admin-github-event-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test('The page requires user to be admin', function(assert) {
2727
page.visit({ id: event.id });
2828

2929
andThen(() => {
30-
assert.equal(page.flashErrors().count, 1, 'Flash error was rendered');
30+
assert.equal(page.flashErrors.length, 1, 'Flash error was rendered');
3131
assert.equal(currentRouteName(), 'projects-list', 'Got redirected');
3232
});
3333
});
@@ -67,7 +67,7 @@ test('Displays all the logged events', function(assert) {
6767
});
6868

6969
andThen(function() {
70-
assert.equal(page.flashMessages().count, 1, 'A flash was displayed');
70+
assert.equal(page.flashMessages.length, 1, 'A flash was displayed');
7171
assert.equal(page.status.text, 'reprocessing', 'The event status changes');
7272
});
7373
});

tests/acceptance/admin-github-events-test.js

+23-23
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ test('The page requires user to be admin', function(assert) {
2424
page.visit();
2525

2626
andThen(() => {
27-
assert.equal(page.flashErrors().count, 1, 'Flash error was rendered');
27+
assert.equal(page.flashErrors.length, 1, 'Flash error was rendered');
2828
assert.equal(currentRouteName(), 'projects-list', 'Got redirected');
2929
});
3030
});
@@ -42,26 +42,26 @@ test('Displays all the logged events', function(assert) {
4242
andThen(function() {
4343
assert.equal(currentURL(), '/admin/github/events');
4444
assert.equal(currentRouteName(), 'admin.github-events.index');
45-
assert.equal(page.logItems().count, 20, 'There are 20 log rows by default.');
46-
assert.equal(page.logItems(0).action.text, githubEvents[0].action);
47-
assert.equal(page.logItems(0).eventType.text, githubEvents[0].eventType);
48-
assert.equal(page.logItems(0).failureReason.text, githubEvents[0].failureReason);
49-
assert.equal(page.logItems(0).status.text, githubEvents[0].status);
50-
assert.ok(page.logItems(0).time.isVisible);
45+
assert.equal(page.logItems.length, 20, 'There are 20 log rows by default.');
46+
assert.equal(page.logItems.objectAt(0).action.text, githubEvents[0].action);
47+
assert.equal(page.logItems.objectAt(0).eventType.text, githubEvents[0].eventType);
48+
assert.equal(page.logItems.objectAt(0).failureReason.text, githubEvents[0].failureReason);
49+
assert.equal(page.logItems.objectAt(0).status.text, githubEvents[0].status);
50+
assert.ok(page.logItems.objectAt(0).time.isVisible);
5151
assert.ok(page.prev.isDisabled, 'Previous button is disabled.');
5252
assert.notOk(page.next.isDisabled, 'Next button is not disabled.');
5353
page.next.click();
5454
});
5555

5656
andThen(function() {
57-
assert.equal(page.logItems().count, 5, 'There are 5 log rows after navigating to the second page.');
57+
assert.equal(page.logItems.length, 5, 'There are 5 log rows after navigating to the second page.');
5858
assert.notOk(page.prev.isDisabled, 'Previous button is not disabled.');
5959
assert.ok(page.next.isDisabled, 'Next button is disabled.');
6060
page.prev.click();
6161
});
6262

6363
andThen(function() {
64-
assert.equal(page.logItems().count, 20, 'There are 20 log rows after navigating back.');
64+
assert.equal(page.logItems.length, 20, 'There are 20 log rows after navigating back.');
6565
assert.ok(page.prev.isDisabled, 'Previous button is disabled.');
6666
assert.notOk(page.next.isDisabled, 'Next button is not disabled.');
6767
});
@@ -79,38 +79,38 @@ test('Filters the logged events', function(assert) {
7979
page.visit();
8080

8181
andThen(() => {
82-
assert.equal(page.logItems().count, 2, 'There are 2 log rows by default.');
82+
assert.equal(page.logItems.length, 2, 'There are 2 log rows by default.');
8383
page.filterStatus.fillIn('errored');
8484
assert.notOk(page.filterAction.isVisible, 'Action filter is not visible.');
8585
});
8686

8787
andThen(() => {
88-
assert.equal(page.logItems().count, 1, 'There are 1 log rows after filtering.');
89-
assert.equal(page.logItems(0).action.text, expectedEvent.action);
90-
assert.equal(page.logItems(0).eventType.text, expectedEvent.eventType);
91-
assert.equal(page.logItems(0).status.text, expectedEvent.status);
88+
assert.equal(page.logItems.length, 1, 'There are 1 log rows after filtering.');
89+
assert.equal(page.logItems.objectAt(0).action.text, expectedEvent.action);
90+
assert.equal(page.logItems.objectAt(0).eventType.text, expectedEvent.eventType);
91+
assert.equal(page.logItems.objectAt(0).status.text, expectedEvent.status);
9292
assert.notOk(page.filterAction.isVisible, 'Action filter is not visible.');
9393
page.filterType.fillIn('issues');
9494
});
9595

9696
andThen(() => {
97-
assert.equal(page.logItems().count, 1, 'There are 1 log rows after filtering.');
98-
assert.equal(page.logItems(0).action.text, expectedEvent.action);
99-
assert.equal(page.logItems(0).eventType.text, expectedEvent.eventType);
100-
assert.equal(page.logItems(0).status.text, expectedEvent.status);
97+
assert.equal(page.logItems.length, 1, 'There are 1 log rows after filtering.');
98+
assert.equal(page.logItems.objectAt(0).action.text, expectedEvent.action);
99+
assert.equal(page.logItems.objectAt(0).eventType.text, expectedEvent.eventType);
100+
assert.equal(page.logItems.objectAt(0).status.text, expectedEvent.status);
101101
assert.ok(page.filterAction.isVisible, 'Action filter is visible.');
102102
page.filterStatus.fillIn('opened');
103103
});
104104

105105
andThen(() => {
106-
assert.equal(page.logItems().count, 1, 'There are 1 log rows after filtering.');
107-
assert.equal(page.logItems(0).action.text, expectedEvent.action);
108-
assert.equal(page.logItems(0).eventType.text, expectedEvent.eventType);
109-
assert.equal(page.logItems(0).status.text, expectedEvent.status);
106+
assert.equal(page.logItems.length, 1, 'There are 1 log rows after filtering.');
107+
assert.equal(page.logItems.objectAt(0).action.text, expectedEvent.action);
108+
assert.equal(page.logItems.objectAt(0).eventType.text, expectedEvent.eventType);
109+
assert.equal(page.logItems.objectAt(0).status.text, expectedEvent.status);
110110
page.clear.click();
111111
});
112112

113113
andThen(() => {
114-
assert.equal(page.logItems().count, 2, 'All items are listed again after clearing filters.');
114+
assert.equal(page.logItems.length, 2, 'All items are listed again after clearing filters.');
115115
});
116116
});

tests/acceptance/admin-organization-invite-new-test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test('The page requires user to be admin', function(assert) {
2626
page.visit();
2727

2828
andThen(() => {
29-
assert.equal(page.flashErrors().count, 1, 'Flash error was rendered');
29+
assert.equal(page.flashErrors.length, 1, 'Flash error was rendered');
3030
assert.equal(currentRouteName(), 'projects-list', 'Got redirected');
3131
});
3232
});
@@ -50,7 +50,7 @@ test('An admin can create and send an organization invite', function(assert) {
5050

5151
andThen(() => {
5252
assert.equal(currentRouteName(), 'admin.organization-invites.index', 'We get redirected to the index');
53-
assert.equal(page.flashMessages().count, 1, 'A flash was displayed');
53+
assert.equal(page.flashMessages.length, 1, 'A flash was displayed');
5454
});
5555
});
5656

@@ -88,7 +88,7 @@ test('Sending an invite can fail with validation errors', function(assert) {
8888
page.inviteForm.clickSubmit();
8989
});
9090

91-
andThen(() => assert.equal(page.inviteForm.errors().count, 2));
91+
andThen(() => assert.equal(page.inviteForm.errors.length, 2));
9292
});
9393

9494
test('Sending an invite can fail with an unknown error', function(assert) {
@@ -120,7 +120,7 @@ test('Sending an invite can fail with an unknown error', function(assert) {
120120
page.inviteForm.clickSubmit();
121121
});
122122

123-
andThen(() => assert.equal(page.flashMessages().count, 1, 'A flash was displayed'));
123+
andThen(() => assert.equal(page.flashMessages.length, 1, 'A flash was displayed'));
124124
});
125125

126126
test('Navigation is successful if user answers positively to prompt', function(assert) {

tests/acceptance/admin-organization-invites-index-test.js

+25-25
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ test('The page requires user to be admin', function(assert) {
2424
page.visit();
2525

2626
andThen(() => {
27-
assert.equal(page.flashErrors().count, 1, 'Flash error was rendered');
27+
assert.equal(page.flashErrors.length, 1, 'Flash error was rendered');
2828
assert.equal(currentRouteName(), 'projects-list', 'Got redirected');
2929
});
3030
});
@@ -47,32 +47,32 @@ test('Displays all the invites', function(assert) {
4747
andThen(() => {
4848
assert.equal(currentURL(), '/admin/organization-invites');
4949
assert.equal(currentRouteName(), 'admin.organization-invites.index');
50-
assert.equal(page.logItems().count, 3, 'There are 3 rows.');
51-
52-
assert.ok(page.logItems(0).icon.isVisible);
53-
assert.equal(page.logItems(0).name.text, invites[0].organization.name);
54-
assert.equal(page.logItems(0).email.text, invites[0].email);
55-
assert.equal(page.logItems(0).approvalStatus.text, 'Pending approval');
56-
assert.ok(page.logItems(0).actions.button.isVisible, 'The approve button renders');
57-
58-
assert.ok(page.logItems(1).icon.isVisible);
59-
assert.equal(page.logItems(1).name.text, invites[1].organization.name);
60-
assert.equal(page.logItems(1).email.text, invites[1].email);
61-
assert.equal(page.logItems(1).approvalStatus.text, 'Approved');
62-
assert.notOk(page.logItems(1).actions.button.isVisible, 'The approve button does not render');
63-
64-
assert.ok(page.logItems(2).icon.isVisible);
65-
assert.equal(page.logItems(2).name.text, invites[2].organizationName);
66-
assert.equal(page.logItems(2).email.text, invites[2].email);
67-
assert.equal(page.logItems(2).approvalStatus.text, 'Invite sent');
68-
assert.notOk(page.logItems(2).actions.button.isVisible, 'The approve button does not render');
69-
70-
page.logItems(0).actions.button.click();
50+
assert.equal(page.logItems.length, 3, 'There are 3 rows.');
51+
52+
assert.ok(page.logItems.objectAt(0).icon.isVisible);
53+
assert.equal(page.logItems.objectAt(0).name.text, invites[0].organization.name);
54+
assert.equal(page.logItems.objectAt(0).email.text, invites[0].email);
55+
assert.equal(page.logItems.objectAt(0).approvalStatus.text, 'Pending approval');
56+
assert.ok(page.logItems.objectAt(0).actions.button.isVisible, 'The approve button renders');
57+
58+
assert.ok(page.logItems.objectAt(1).icon.isVisible);
59+
assert.equal(page.logItems.objectAt(1).name.text, invites[1].organization.name);
60+
assert.equal(page.logItems.objectAt(1).email.text, invites[1].email);
61+
assert.equal(page.logItems.objectAt(1).approvalStatus.text, 'Approved');
62+
assert.notOk(page.logItems.objectAt(1).actions.button.isVisible, 'The approve button does not render');
63+
64+
assert.ok(page.logItems.objectAt(2).icon.isVisible);
65+
assert.equal(page.logItems.objectAt(2).name.text, invites[2].organizationName);
66+
assert.equal(page.logItems.objectAt(2).email.text, invites[2].email);
67+
assert.equal(page.logItems.objectAt(2).approvalStatus.text, 'Invite sent');
68+
assert.notOk(page.logItems.objectAt(2).actions.button.isVisible, 'The approve button does not render');
69+
70+
page.logItems.objectAt(0).actions.button.click();
7171
});
7272

7373
andThen(() => {
74-
assert.equal(page.flashMessages().count, 1, 'A flash was displayed');
75-
assert.equal(page.logItems(0).approvalStatus.text, 'Approved');
76-
assert.notOk(page.logItems(0).actions.button.isVisible, 'The approve button does not render');
74+
assert.equal(page.flashMessages.length, 1, 'A flash was displayed');
75+
assert.equal(page.logItems.objectAt(0).approvalStatus.text, 'Approved');
76+
assert.notOk(page.logItems.objectAt(0).actions.button.isVisible, 'The approve button does not render');
7777
});
7878
});

tests/acceptance/admin-projects-test.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test('The page requires user to be admin', function(assert) {
2525
page.visit();
2626

2727
andThen(() => {
28-
assert.equal(page.flashErrors().count, 1, 'Flash error was rendered');
28+
assert.equal(page.flashErrors.length, 1, 'Flash error was rendered');
2929
assert.equal(currentRouteName(), 'projects-list', 'Got redirected');
3030
});
3131
});
@@ -51,21 +51,21 @@ test('An admin can view a list of projects', function(assert) {
5151
assert.equal(currentURL(), '/admin/projects');
5252
assert.equal(currentRouteName(), 'admin.projects.index');
5353

54-
assert.equal(page.items().count, 3, 'There are 3 rows.');
54+
assert.equal(page.items.length, 3, 'There are 3 rows.');
5555

5656
[unapprovedProject, projectPendingApproval, approvedProject].forEach((project, index) => {
57-
assert.equal(page.items(index).title.text, project.title, 'Project title is rendered.');
58-
assert.equal(page.items(index).icon.src, project.iconThumbUrl, 'Project icon is rendered.');
57+
assert.equal(page.items.objectAt(index).title.text, project.title, 'Project title is rendered.');
58+
assert.equal(page.items.objectAt(index).icon.src, project.iconThumbUrl, 'Project icon is rendered.');
5959
});
6060

61-
assert.equal(page.items(0).approvalStatus.text, 'Created', 'Correct status is rendered for newly created project.');
62-
assert.notOk(page.items(0).actions.approve.isVisible, 'Approve button is not rendered for newly created project.');
61+
assert.equal(page.items.objectAt(0).approvalStatus.text, 'Created', 'Correct status is rendered for newly created project.');
62+
assert.notOk(page.items.objectAt(0).actions.approve.isVisible, 'Approve button is not rendered for newly created project.');
6363

64-
assert.equal(page.items(1).approvalStatus.text, 'Pending approval', 'Correct status is rendered for project pending approval.');
65-
assert.ok(page.items(1).actions.approve.isVisible, 'Approve button is rendered for project pending approval.');
64+
assert.equal(page.items.objectAt(1).approvalStatus.text, 'Pending approval', 'Correct status is rendered for project pending approval.');
65+
assert.ok(page.items.objectAt(1).actions.approve.isVisible, 'Approve button is rendered for project pending approval.');
6666

67-
assert.equal(page.items(2).approvalStatus.text, 'Approved', 'Correct status is rendered for approved project.');
68-
assert.notOk(page.items(2).actions.approve.isVisible, 'Approve button is not rendered for approved project');
67+
assert.equal(page.items.objectAt(2).approvalStatus.text, 'Approved', 'Correct status is rendered for approved project.');
68+
assert.notOk(page.items.objectAt(2).actions.approve.isVisible, 'Approve button is not rendered for approved project');
6969
});
7070
});
7171

@@ -80,12 +80,12 @@ test('An admin can approve a project', function(assert) {
8080
page.visit();
8181

8282
andThen(() => {
83-
page.items(0).actions.approve.click();
83+
page.items.objectAt(0).actions.approve.click();
8484
});
8585

8686
andThen(() => {
8787
assert.ok(unapprovedProject.approved, 'Project is approved.');
88-
assert.equal(page.items(0).approvalStatus.text, 'Approved', 'Project status is rendered correctly.');
88+
assert.equal(page.items.objectAt(0).approvalStatus.text, 'Approved', 'Project status is rendered correctly.');
8989
});
9090
});
9191

@@ -115,10 +115,10 @@ test('A flash error renders when project approval fails', function(assert) {
115115
});
116116

117117
andThen(() => {
118-
page.items(0).actions.approve.click();
118+
page.items.objectAt(0).actions.approve.click();
119119
});
120120

121121
andThen(() => {
122-
assert.equal(page.flashErrors().count, 1, 'Flash error is rendered.');
122+
assert.equal(page.flashErrors.length, 1, 'Flash error is rendered.');
123123
});
124124
});

tests/acceptance/admin-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test('Redirects when not an admin', function(assert) {
2525

2626
andThen(() => {
2727
assert.equal(currentRouteName(), 'projects-list');
28-
assert.equal(page.flashMessages().count, 1, 'A flash was displayed');
28+
assert.equal(page.flashMessages.length, 1, 'A flash was displayed');
2929
});
3030
});
3131

tests/acceptance/footer-test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test('can visit links from footer on index', function(assert) {
99
indexPage.visit();
1010

1111
andThen(function() {
12-
assert.equal(indexPage.siteFooter.columns().count, 4);
12+
assert.equal(indexPage.siteFooter.columns.length, 4);
1313
indexPage.siteFooter.clickAboutLink();
1414
});
1515

@@ -34,8 +34,8 @@ test('renders horizontal on smaller screens', function(assert) {
3434
});
3535

3636
andThen(function() {
37-
assert.equal(indexPage.siteFooter.columns().count, 0);
38-
assert.equal(indexPage.siteFooter.rows().count, 6);
37+
assert.equal(indexPage.siteFooter.columns.length, 0);
38+
assert.equal(indexPage.siteFooter.rows.length, 6);
3939
});
4040
});
4141

@@ -45,7 +45,7 @@ test('renders horizontal on most pages', function(assert) {
4545
setBreakpoint('full');
4646

4747
andThen(function() {
48-
assert.equal(indexPage.siteFooter.columns().count, 0);
49-
assert.equal(indexPage.siteFooter.rows().count, 6);
48+
assert.equal(indexPage.siteFooter.columns.length, 0);
49+
assert.equal(indexPage.siteFooter.rows.length, 6);
5050
});
5151
});

tests/acceptance/github-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ test('if state is invalid, goes back to ingtegrations page with a flash error',
3535
'User was redirected back to integrations.'
3636
);
3737

38-
assert.equal(page.flashMessages().count, 1, 'A flash was displayed');
38+
assert.equal(page.flashMessages.length, 1, 'A flash was displayed');
3939
});
4040
});
4141

@@ -93,6 +93,6 @@ test('if connect request fails, redirects to integrations with a flash error', f
9393
'User was redirected to the integrations page.'
9494
);
9595

96-
assert.equal(page.flashMessages().count, 1, 'A flash was displayed');
96+
assert.equal(page.flashMessages.length, 1, 'A flash was displayed');
9797
});
9898
});

tests/acceptance/login-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ test('Login failure', function(assert) {
4242
});
4343

4444
andThen(() => {
45-
assert.equal(loginPage.form.errors().count, 1, 'One error is shown');
46-
assert.equal(loginPage.form.errors(0).text, ERROR_TEXT, 'Page contains login error');
45+
assert.equal(loginPage.form.errors.length, 1, 'One error is shown');
46+
assert.equal(loginPage.form.errors.objectAt(0).text, ERROR_TEXT, 'Page contains login error');
4747
});
4848
});
4949

tests/acceptance/navigation-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ test('Logged in, user with organizations can navigate to projects', function(ass
119119
indexPage.navMenu.projectSwitcher.menuLink.click();
120120
});
121121
andThen(function() {
122-
indexPage.navMenu.projectSwitcher.projectSwitcherMenu.menu.projects(0).icon.click();
122+
indexPage.navMenu.projectSwitcher.projectSwitcherMenu.menu.projects.objectAt(0).icon.click();
123123
});
124124
andThen(function() {
125125
assert.equal(currentRouteName(), 'project.index');

0 commit comments

Comments
 (0)