Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Leverage the latest PO api refactoring. #3561

Merged
merged 2 commits into from
Oct 6, 2016
Merged

Leverage the latest PO api refactoring. #3561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f1164a
Leverage the latest PO api refactoring.
webteckie Oct 4, 2016
07435cc
Bump keystone-nightwatch-e2e dependency.
webteckie Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"eslint-plugin-react": "5.2.2",
"istanbul": "0.4.5",
"keystone-email": "1.0.5",
"keystone-nightwatch-e2e": "^0.1.9",
"keystone-nightwatch-e2e": "^0.1.10",
"mocha": "3.1.0",
"must": "0.13.2",
"proxyquire": "1.7.10",
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/adminUI/tests/group002Home/uxTestHomeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ module.exports = {
.click('@nameListSubmenu')
.waitForListScreen();

browser.adminUIListScreen
.click('@singleItemDeleteIcon');
browser.adminUIListScreen.clickDeleteItemIcon([
{ row: 1, column: 1 }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still a little unsure about the clickDeleteItemIcon function. The delete icon is always in column 1 is it not?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jstockwin not sure and why make that assumption? The list can be configured with options that cause other icons to show to the left of the items. Not sure why you think this should be a special case.

])

browser.adminUIDeleteConfirmation
.waitForElementVisible('@deleteButton');
browser.adminUIApp.waitForDeleteConfirmationScreen();

browser.adminUIDeleteConfirmation
.click('@deleteButton');
Expand Down
16 changes: 8 additions & 8 deletions test/e2e/adminUI/tests/group003List/uiTestListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,30 @@ module.exports = {
browser.end();
},
'List screen must show a search bar': function (browser) {
browser.adminUIListScreen.assertSearchInputFieldVisible();
browser.adminUIListScreen.assertElementIsVisible('searchInputField');
},
'List screen must show a search field clear icon': function (browser) {
browser.adminUIListScreen.assertSearchInputClearIconVisible();
browser.adminUIListScreen.assertElementIsVisible('searchInputFieldClearIcon');
},
'List screen must show a filter input': function (browser) {
browser.adminUIListScreen.assertFilterDropDownVisible();
browser.adminUIListScreen.assertElementIsVisible('filterDropdown');
},
'List screen must show a column input': function (browser) {
browser.adminUIListScreen.assertColumnSelectionDropdownVisible();
browser.adminUIListScreen.assertElementIsVisible('columnSelectionDropdown');
},
'List screen must show a download input': function (browser) {
browser.adminUIListScreen.assertDownloadDropdownVisible();
browser.adminUIListScreen.assertElementIsVisible('downloadDropdown');
},
// TODO: For some reason the expand table width input control does not show in saucelabs' Firefox 44...why?
// It shows fine with local selenium server and Firefox 44.0.2
// 'List screen must show an expand table width input': function (browser) {
// browser.adminUIListScreen.assertExpandTableWidthInputVisible();
// browser.adminUIListScreen.assertElementIsVisible('expandTableIcon');
// },
'List screen must show a create list item button': function (browser) {
browser.adminUIListScreen.assertCreateMoreItemsButtonVisible();
browser.adminUIListScreen.assertElementIsVisible('createItemButton');
},
'List screen must show a page item count': function (browser) {
browser.adminUIListScreen.assertPageItemCountTextVisible();
browser.adminUIListScreen.assertElementIsVisible('pageItemCount');
},
'List screen must show a name column header': function (browser) {
browser.adminUIListScreen.assertItemListHeaderVisible({ column: 1 });
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/adminUI/tests/group003List/uxTestListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = {

browser.adminUIApp.openList({section: 'fields', list: 'Name'});

browser.adminUIListScreen.assertPageItemCountTextEquals('Showing 1 Name');
browser.adminUIListScreen.assertElementTextEquals('pageItemCount', 'Showing 1 Name');

browser.adminUIListScreen.assertItemFieldValueEquals([
{ row: 1, column: 2, name: 'name', value: 'Name Field Test 1', }
Expand All @@ -69,7 +69,7 @@ module.exports = {

browser.adminUIApp.openList({section: 'fields', list: 'Name'});

browser.adminUIListScreen.assertPageItemCountTextEquals('Showing 2 Names');
browser.adminUIListScreen.assertElementTextEquals('pageItemCount','Showing 2 Names');

browser.adminUIListScreen.assertItemFieldValueEquals([
{ row: 1, column: 2, name: 'name', value: 'Name Field Test 1',},
Expand Down Expand Up @@ -108,7 +108,7 @@ module.exports = {

browser.adminUIApp.waitForListScreen();

browser.adminUIListScreen.assertPageItemCountTextEquals('Showing 1 Name');
browser.adminUIListScreen.assertElementTextEquals('pageItemCount', 'Showing 1 Name');

browser.adminUIListScreen.assertItemFieldValueEquals([
{ row: 1, column: 2, name: 'name', value: 'Name Field Test 2',},
Expand All @@ -119,7 +119,7 @@ module.exports = {

browser.adminUIApp.waitForListScreen();

browser.adminUIListScreen.assertPageItemCountTextEquals('Showing 2 Names');
browser.adminUIListScreen.assertElementTextEquals('pageItemCount', 'Showing 2 Names');

browser.adminUIListScreen.assertItemFieldValueEquals([
{ row: 1, column: 2, name: 'name', value: 'Name Field Test 1',},
Expand All @@ -138,7 +138,7 @@ module.exports = {

browser.adminUIApp.waitForListScreen();

browser.adminUIListScreen.assertPageItemCountTextEquals('Showing 1 Name');
browser.adminUIListScreen.assertElementTextEquals('pageItemCount', 'Showing 1 Name');

browser.adminUIListScreen.assertItemFieldValueEquals([
{ row: 1, column: 2, name: 'name', value: 'Name Field Test 2',},
Expand All @@ -158,7 +158,7 @@ module.exports = {

browser.adminUIApp.waitForListScreen();

browser.adminUIListScreen.assertNoItemsFoundTextEquals('No names found…');
browser.adminUIListScreen.assertElementTextEquals('noItemsFoundText', 'No names found…');
},

// UNDO ANY STATE CHANGES -- THIS TEST SHOULD RUN LAST
Expand Down
92 changes: 22 additions & 70 deletions test/e2e/adminUI/tests/group004Item/uiTestItemView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,108 +32,60 @@ module.exports = {
browser.end();
},
'Item screen should show a search input icon to search for list items': function (browser) {
browser.adminUIItemScreen
.expect.element('@searchInputIcon')
.to.be.visible;
browser.adminUIItemScreen.assertElementIsVisible('searchInputIcon');
},
'Item screen should show breadcrumb links to go back to the origin list': function (browser) {
browser.adminUIItemScreen.expect.element('@listBreadcrumb')
.to.be.visible;

browser.adminUIItemScreen.expect.element('@listBreadcrumb')
.text.to.equal('Users');
browser.adminUIItemScreen.assertElementIsVisible('listBreadcrumb');
browser.adminUIItemScreen.assertElementTextEquals('listBreadcrumb', 'Users');
},
'Item screen should show a + New <item> button to create new items': function (browser) {
browser.adminUIItemScreen
.expect.element('@newItemButton')
.to.be.visible;
browser.adminUIItemScreen.assertElementIsVisible('newItemButton');
},
'Item screen should show an item name header': function (browser) {
browser.adminUIItemScreen
.expect.element('@readOnlyNameHeader')
.to.be.visible;

browser.adminUIItemScreen
.expect.element('@readOnlyNameHeader')
.text.to.equal('e2e user');
browser.adminUIItemScreen.assertElementIsVisible('readOnlyNameHeader');
browser.adminUIItemScreen.assertElementTextEquals('readOnlyNameHeader', 'e2e user');
},
'Item screen should show an item id label': function (browser) {
browser.adminUIItemScreen
.expect.element('@idLabel')
.to.be.visible;
browser.adminUIItemScreen.assertElementIsVisible('idLabel');
},
'Item screen should show an item id value': function (browser) {
browser.adminUIItemScreen
.expect.element('@idValue')
.to.be.visible;
browser.adminUIItemScreen.assertElementIsVisible('idValue');
},
'Item screen should show an item Meta header': function (browser) {
browser.adminUIItemScreen
.expect.element('@metaHeader')
.to.be.visible;

browser.adminUIItemScreen
.expect.element('@metaHeader')
.text.to.equal('Meta');
browser.adminUIItemScreen.assertElementIsVisible('metaHeader');
browser.adminUIItemScreen.assertElementTextEquals('metaHeader', 'Meta');
},
'Item screen should show an item meta Created On label': function (browser) {
browser.adminUIItemScreen
.expect.element('@metaCreatedAtLabel')
.to.be.visible;
browser.adminUIItemScreen.assertElementIsVisible('metaCreatedAtLabel');
},
'Item screen should show an item meta Created On value': function (browser) {
browser.adminUIItemScreen
.expect.element('@metaCreatedAtValue')
.to.be.visible;
browser.adminUIItemScreen.assertElementIsVisible('metaCreatedAtValue');
},
// TODO: The following are only testable with lists updated via a user session;
// Currently the admin User is not created via a user session.
// These assertions should be done by the fields!
// 'Item screen should show an item meta Created By label': function (browser) {
// browser.adminUIItemScreen
// .expect.element('@metaCreatedByLabel')
// .to.be.visible;
// browser.adminUIItemScreen.assertElementIsVisible('metaCreatedByLabel');
// },
// 'Item screen should show an item meta Created By value': function (browser) {
// browser.adminUIItemScreen
// .expect.element('@metaCreatedByValue')
// .to.be.visible;
// browser.adminUIItemScreen.assertElementIsVisible('metaCreatedByValue');
// },
// 'Item screen should show an item meta Updated By label': function (browser) {
// browser.adminUIItemScreen
// .expect.element('@metaUpdatedByLabel')
// .to.be.visible;
// browser.adminUIItemScreen.assertElementIsVisible('metaUpdatedByLabel');
// },
// 'Item screen should show an item meta Updated By value': function (browser) {
// browser.adminUIItemScreen
// .expect.element('@metaUpdatedByValue')
// .to.be.visible;
// browser.adminUIItemScreen.assertElementIsVisible('metaUpdatedByValue');
// },
'Item screen should show an item save button': function (browser) {
browser.adminUIItemScreen
.expect.element('@saveButton')
.to.be.visible;

browser.adminUIItemScreen
.expect.element('@saveButton')
.text.to.equal('Save');
browser.adminUIItemScreen.assertElementIsVisible('saveButton');
browser.adminUIItemScreen.assertElementTextEquals('saveButton', 'Save');
},
'Item screen should show an item reset button': function (browser) {
browser.adminUIItemScreen
.expect.element('@resetButton')
.to.be.visible;

browser.adminUIItemScreen
.expect.element('@resetButtonText')
.text.to.equal('reset changes');
browser.adminUIItemScreen.assertElementIsVisible('resetButton');
browser.adminUIItemScreen.assertElementTextEquals('resetButtonText', 'reset changes');
},
'Item screen should show an item delete button': function (browser) {
browser.adminUIItemScreen
.expect.element('@deleteButton')
.to.be.visible;

browser.adminUIItemScreen
.expect.element('@deleteButtonText')
.text.to.equal('delete user');
browser.adminUIItemScreen.assertElementIsVisible('deleteButton');
browser.adminUIItemScreen.assertElementTextEquals('deleteButtonText', 'delete user');
},
};
4 changes: 2 additions & 2 deletions test/e2e/adminUI/tests/group004Item/uxTestItemView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module.exports = {
'Item screen should allow saving an item without changes': function (browser) {
browser.adminUIItemScreen.save();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');
},
'Item screen should allow saving an item with changes': function (browser) {
browser.adminUIItemScreen.fillFieldInputs([
Expand All @@ -70,7 +70,7 @@ module.exports = {

browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();
browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');
},
'Item screen should allow resetting an item with changes': function (browser) {
browser.adminUIItemScreen.fillFieldInputs([
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testBooleanField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Boolean Field Test 1' }, },
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testCodeField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Code Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testColorField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Color Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testDateArrayField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

/* TODO Pending fix of timezone issues which are causing Travis CI to fail
browser.adminUIItemScreen.assertFieldInputs([
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testDateField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

/* TODO Pending fix of timezone issues which are causing Travis CI to fail
browser.adminUIItemScreen.assertFieldInputs([
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testDatetimeField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Datetime Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testEmailField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Email Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testGeoPointField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'GeoPoint Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testHtmlField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Html Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testKeyField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Key Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testLocationField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Location Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testMarkdownField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Markdown Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testMoneyField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Money Field Test 1' },},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminUI/tests/group005Fields/testNameField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
browser.adminUIItemScreen.save();
browser.adminUIApp.waitForItemScreen();

browser.adminUIItemScreen.assertFlashMessage('Your changes have been saved successfully');
browser.adminUIItemScreen.assertElementTextEquals('flashMessage', 'Your changes have been saved successfully');

browser.adminUIItemScreen.assertFieldInputs([
{ name: 'name', input: { value: 'Name Field Test 1' },},
Expand Down
Loading