From 5f1164a1a583b6dc5efc00b3006c4f0b5465ad6d Mon Sep 17 00:00:00 2001 From: Carlos Colon Date: Mon, 3 Oct 2016 21:54:02 -0400 Subject: [PATCH 1/2] Leverage the latest PO api refactoring. --- .../tests/group002Home/uxTestHomeView.js | 8 +- .../tests/group003List/uiTestListView.js | 16 ++-- .../tests/group003List/uxTestListView.js | 12 +-- .../tests/group004Item/uiTestItemView.js | 92 +++++-------------- .../tests/group004Item/uxTestItemView.js | 4 +- .../tests/group005Fields/testBooleanField.js | 2 +- .../tests/group005Fields/testCodeField.js | 2 +- .../tests/group005Fields/testColorField.js | 2 +- .../group005Fields/testDateArrayField.js | 2 +- .../tests/group005Fields/testDateField.js | 2 +- .../tests/group005Fields/testDatetimeField.js | 2 +- .../tests/group005Fields/testEmailField.js | 2 +- .../tests/group005Fields/testGeoPointField.js | 2 +- .../tests/group005Fields/testHtmlField.js | 2 +- .../tests/group005Fields/testKeyField.js | 2 +- .../tests/group005Fields/testLocationField.js | 2 +- .../tests/group005Fields/testMarkdownField.js | 2 +- .../tests/group005Fields/testMoneyField.js | 2 +- .../tests/group005Fields/testNameField.js | 2 +- .../group005Fields/testNumberArrayField.js | 2 +- .../tests/group005Fields/testNumberField.js | 2 +- .../tests/group005Fields/testPasswordField.js | 6 +- .../group005Fields/testRelationshipField.js | 2 +- .../tests/group005Fields/testSelectField.js | 2 +- .../group005Fields/testTextArrayField.js | 2 +- .../tests/group005Fields/testTextField.js | 2 +- .../tests/group005Fields/testTextareaField.js | 2 +- .../tests/group005Fields/testUrlField.js | 2 +- 28 files changed, 67 insertions(+), 115 deletions(-) diff --git a/test/e2e/adminUI/tests/group002Home/uxTestHomeView.js b/test/e2e/adminUI/tests/group002Home/uxTestHomeView.js index 51d42b5581..4b919fc2ca 100644 --- a/test/e2e/adminUI/tests/group002Home/uxTestHomeView.js +++ b/test/e2e/adminUI/tests/group002Home/uxTestHomeView.js @@ -102,11 +102,11 @@ module.exports = { .click('@nameListSubmenu') .waitForListScreen(); - browser.adminUIListScreen - .click('@singleItemDeleteIcon'); + browser.adminUIListScreen.clickDeleteItemIcon([ + { row: 1, column: 1 } + ]) - browser.adminUIDeleteConfirmation - .waitForElementVisible('@deleteButton'); + browser.adminUIApp.waitForDeleteConfirmationScreen(); browser.adminUIDeleteConfirmation .click('@deleteButton'); diff --git a/test/e2e/adminUI/tests/group003List/uiTestListView.js b/test/e2e/adminUI/tests/group003List/uiTestListView.js index c2d1647372..ac8a43e6dc 100644 --- a/test/e2e/adminUI/tests/group003List/uiTestListView.js +++ b/test/e2e/adminUI/tests/group003List/uiTestListView.js @@ -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 }); diff --git a/test/e2e/adminUI/tests/group003List/uxTestListView.js b/test/e2e/adminUI/tests/group003List/uxTestListView.js index e2b3cd2283..d3a70786da 100644 --- a/test/e2e/adminUI/tests/group003List/uxTestListView.js +++ b/test/e2e/adminUI/tests/group003List/uxTestListView.js @@ -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', } @@ -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',}, @@ -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',}, @@ -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',}, @@ -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',}, @@ -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 diff --git a/test/e2e/adminUI/tests/group004Item/uiTestItemView.js b/test/e2e/adminUI/tests/group004Item/uiTestItemView.js index 8107be3580..fe841bf46b 100644 --- a/test/e2e/adminUI/tests/group004Item/uiTestItemView.js +++ b/test/e2e/adminUI/tests/group004Item/uiTestItemView.js @@ -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 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'); }, }; diff --git a/test/e2e/adminUI/tests/group004Item/uxTestItemView.js b/test/e2e/adminUI/tests/group004Item/uxTestItemView.js index 7f440731b3..a669b451f3 100644 --- a/test/e2e/adminUI/tests/group004Item/uxTestItemView.js +++ b/test/e2e/adminUI/tests/group004Item/uxTestItemView.js @@ -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([ @@ -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([ diff --git a/test/e2e/adminUI/tests/group005Fields/testBooleanField.js b/test/e2e/adminUI/tests/group005Fields/testBooleanField.js index 38386920ed..9f5f09fe6f 100644 --- a/test/e2e/adminUI/tests/group005Fields/testBooleanField.js +++ b/test/e2e/adminUI/tests/group005Fields/testBooleanField.js @@ -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' }, }, diff --git a/test/e2e/adminUI/tests/group005Fields/testCodeField.js b/test/e2e/adminUI/tests/group005Fields/testCodeField.js index a15f5ec999..8792ebcd2f 100644 --- a/test/e2e/adminUI/tests/group005Fields/testCodeField.js +++ b/test/e2e/adminUI/tests/group005Fields/testCodeField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testColorField.js b/test/e2e/adminUI/tests/group005Fields/testColorField.js index ec9c3621b7..b7abb7a189 100644 --- a/test/e2e/adminUI/tests/group005Fields/testColorField.js +++ b/test/e2e/adminUI/tests/group005Fields/testColorField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testDateArrayField.js b/test/e2e/adminUI/tests/group005Fields/testDateArrayField.js index 2a8a4e1dbc..ad2e137230 100644 --- a/test/e2e/adminUI/tests/group005Fields/testDateArrayField.js +++ b/test/e2e/adminUI/tests/group005Fields/testDateArrayField.js @@ -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([ diff --git a/test/e2e/adminUI/tests/group005Fields/testDateField.js b/test/e2e/adminUI/tests/group005Fields/testDateField.js index a506d0223e..4ac54c9785 100644 --- a/test/e2e/adminUI/tests/group005Fields/testDateField.js +++ b/test/e2e/adminUI/tests/group005Fields/testDateField.js @@ -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([ diff --git a/test/e2e/adminUI/tests/group005Fields/testDatetimeField.js b/test/e2e/adminUI/tests/group005Fields/testDatetimeField.js index 6e96238d0c..6debfe3535 100644 --- a/test/e2e/adminUI/tests/group005Fields/testDatetimeField.js +++ b/test/e2e/adminUI/tests/group005Fields/testDatetimeField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testEmailField.js b/test/e2e/adminUI/tests/group005Fields/testEmailField.js index 4d0c1f6963..32f192a9f3 100644 --- a/test/e2e/adminUI/tests/group005Fields/testEmailField.js +++ b/test/e2e/adminUI/tests/group005Fields/testEmailField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testGeoPointField.js b/test/e2e/adminUI/tests/group005Fields/testGeoPointField.js index 3900b290f9..64e06ac7cb 100644 --- a/test/e2e/adminUI/tests/group005Fields/testGeoPointField.js +++ b/test/e2e/adminUI/tests/group005Fields/testGeoPointField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testHtmlField.js b/test/e2e/adminUI/tests/group005Fields/testHtmlField.js index 785bafff0b..c790881128 100644 --- a/test/e2e/adminUI/tests/group005Fields/testHtmlField.js +++ b/test/e2e/adminUI/tests/group005Fields/testHtmlField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testKeyField.js b/test/e2e/adminUI/tests/group005Fields/testKeyField.js index 27de6c3abb..219fb58fcd 100644 --- a/test/e2e/adminUI/tests/group005Fields/testKeyField.js +++ b/test/e2e/adminUI/tests/group005Fields/testKeyField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testLocationField.js b/test/e2e/adminUI/tests/group005Fields/testLocationField.js index 185e49856f..027c094b09 100644 --- a/test/e2e/adminUI/tests/group005Fields/testLocationField.js +++ b/test/e2e/adminUI/tests/group005Fields/testLocationField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testMarkdownField.js b/test/e2e/adminUI/tests/group005Fields/testMarkdownField.js index 8226b759dd..3a90054c5b 100644 --- a/test/e2e/adminUI/tests/group005Fields/testMarkdownField.js +++ b/test/e2e/adminUI/tests/group005Fields/testMarkdownField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testMoneyField.js b/test/e2e/adminUI/tests/group005Fields/testMoneyField.js index 98fee79d1c..419289a2cc 100644 --- a/test/e2e/adminUI/tests/group005Fields/testMoneyField.js +++ b/test/e2e/adminUI/tests/group005Fields/testMoneyField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testNameField.js b/test/e2e/adminUI/tests/group005Fields/testNameField.js index 023cc696ad..a629649931 100644 --- a/test/e2e/adminUI/tests/group005Fields/testNameField.js +++ b/test/e2e/adminUI/tests/group005Fields/testNameField.js @@ -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' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testNumberArrayField.js b/test/e2e/adminUI/tests/group005Fields/testNumberArrayField.js index a09bb9c97f..eb1f4b8692 100644 --- a/test/e2e/adminUI/tests/group005Fields/testNumberArrayField.js +++ b/test/e2e/adminUI/tests/group005Fields/testNumberArrayField.js @@ -86,7 +86,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: 'NumberArray Field Test 1' },}, diff --git a/test/e2e/adminUI/tests/group005Fields/testNumberField.js b/test/e2e/adminUI/tests/group005Fields/testNumberField.js index b5d81ba913..d21aeeb4d3 100644 --- a/test/e2e/adminUI/tests/group005Fields/testNumberField.js +++ b/test/e2e/adminUI/tests/group005Fields/testNumberField.js @@ -59,7 +59,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: 'Number Field Test 1' }, }, diff --git a/test/e2e/adminUI/tests/group005Fields/testPasswordField.js b/test/e2e/adminUI/tests/group005Fields/testPasswordField.js index 8ee11dca1b..58d0665eb3 100644 --- a/test/e2e/adminUI/tests/group005Fields/testPasswordField.js +++ b/test/e2e/adminUI/tests/group005Fields/testPasswordField.js @@ -35,7 +35,7 @@ module.exports = { { name: 'fieldA', input: {value: 'password1', confirm: 'wrongPassword1'}, }, ]); browser.adminUIInitialFormScreen.save(); - browser.adminUIInitialFormScreen.assertFlashError("Passwords must match"); + browser.adminUIInitialFormScreen.assertElementTextEquals('flashError', "Passwords must match"); browser.adminUIInitialFormScreen.fillFieldInputs([ { name: 'fieldA', input: {value: 'password1', confirm: 'password1'}, }, ]); @@ -70,7 +70,7 @@ module.exports = { browser.adminUIItemScreen.save(); browser.adminUIApp.waitForItemScreen(); - browser.adminUIItemScreen.assertFlashError('Passwords must match'); + browser.adminUIItemScreen.assertElementTextEquals('flashError', 'Passwords must match'); browser.adminUIItemScreen.fillFieldInputs([ { name: 'fieldB', input: {value: 'password2', confirm: 'password2'}, }, @@ -78,7 +78,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: 'Password Field Test 1' }, }, diff --git a/test/e2e/adminUI/tests/group005Fields/testRelationshipField.js b/test/e2e/adminUI/tests/group005Fields/testRelationshipField.js index 41ce014d17..88b7e702d5 100644 --- a/test/e2e/adminUI/tests/group005Fields/testRelationshipField.js +++ b/test/e2e/adminUI/tests/group005Fields/testRelationshipField.js @@ -60,7 +60,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: 'Relationship Field Test 1' }, }, diff --git a/test/e2e/adminUI/tests/group005Fields/testSelectField.js b/test/e2e/adminUI/tests/group005Fields/testSelectField.js index 736d02ca7c..0fcd1e1daf 100644 --- a/test/e2e/adminUI/tests/group005Fields/testSelectField.js +++ b/test/e2e/adminUI/tests/group005Fields/testSelectField.js @@ -60,7 +60,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: 'Select Field Test 1' }, }, diff --git a/test/e2e/adminUI/tests/group005Fields/testTextArrayField.js b/test/e2e/adminUI/tests/group005Fields/testTextArrayField.js index a8c9656298..7a27e9b4a9 100644 --- a/test/e2e/adminUI/tests/group005Fields/testTextArrayField.js +++ b/test/e2e/adminUI/tests/group005Fields/testTextArrayField.js @@ -84,7 +84,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: 'fieldA', input: { text1: 'Test text 1', text2: 'Test text 2' }, }, diff --git a/test/e2e/adminUI/tests/group005Fields/testTextField.js b/test/e2e/adminUI/tests/group005Fields/testTextField.js index d355244e8f..1c1e367340 100644 --- a/test/e2e/adminUI/tests/group005Fields/testTextField.js +++ b/test/e2e/adminUI/tests/group005Fields/testTextField.js @@ -59,7 +59,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: 'Text Field Test 1' }, }, diff --git a/test/e2e/adminUI/tests/group005Fields/testTextareaField.js b/test/e2e/adminUI/tests/group005Fields/testTextareaField.js index 4fcabc6ba4..3724f2aae1 100644 --- a/test/e2e/adminUI/tests/group005Fields/testTextareaField.js +++ b/test/e2e/adminUI/tests/group005Fields/testTextareaField.js @@ -60,7 +60,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: 'Textarea Field Test 1' }, }, diff --git a/test/e2e/adminUI/tests/group005Fields/testUrlField.js b/test/e2e/adminUI/tests/group005Fields/testUrlField.js index b27c57c3a9..aba5496fac 100644 --- a/test/e2e/adminUI/tests/group005Fields/testUrlField.js +++ b/test/e2e/adminUI/tests/group005Fields/testUrlField.js @@ -60,7 +60,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: 'Url Field Test 1' }, }, From 07435ccff47076af1f77f6710d42b807fcd01d41 Mon Sep 17 00:00:00 2001 From: Carlos Colon Date: Tue, 4 Oct 2016 07:15:05 -0400 Subject: [PATCH 2/2] Bump keystone-nightwatch-e2e dependency. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd78e21ee7..9bbbf15ca1 100644 --- a/package.json +++ b/package.json @@ -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",