From 5b0b6e83bc22b79c6dfbb192a55dbaeb280180b6 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 7 Aug 2018 22:47:40 +0100 Subject: [PATCH] fix broken test after correction i18n --- e2e/content-services/search_multiselect.e2e.ts | 10 +++++----- e2e/pages/adf/navigationBarPage.js | 4 ++-- package.json | 2 +- scripts/test-e2e-lib.sh | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/e2e/content-services/search_multiselect.e2e.ts b/e2e/content-services/search_multiselect.e2e.ts index 6fb16d51f1..2eb66f8113 100644 --- a/e2e/content-services/search_multiselect.e2e.ts +++ b/e2e/content-services/search_multiselect.e2e.ts @@ -106,13 +106,13 @@ describe('Search Component - Multi-Select Facet', () => { }); it('[C280054] Multiple items can be selected from a search facet filter', () => { - searchFiltersPage.filterByFileType("Plain Text"); + searchFiltersPage.filterByFileType('Plain Text'); expect(searchResultsPage.numberOfResultsDisplayed()).toBe(2); searchResultsPage.checkContentIsDisplayed(txtFile.entry.name); searchResultsPage.checkContentIsDisplayed(txtFileSite.entry.name); - searchFiltersPage.filterByFileType("JPEG Image"); + searchFiltersPage.filterByFileType('JPEG Image'); expect(searchResultsPage.numberOfResultsDisplayed()).toBe(4); searchResultsPage.checkContentIsDisplayed(txtFile.entry.name); @@ -186,8 +186,8 @@ describe('Search Component - Multi-Select Facet', () => { it('[C280056] Multiple items can be selected from multiple search facets', () => { searchFiltersPage.checkSearchFiltersIsDisplayed(); - searchFiltersPage.filterByFileType("Plain Text"); - searchFiltersPage.filterByFileType("JPEG Image"); + searchFiltersPage.filterByFileType('Plain Text'); + searchFiltersPage.filterByFileType('JPEG Image'); searchResultsPage.checkContentIsDisplayed(txtFile.entry.name); searchResultsPage.checkContentIsDisplayed(jpgFile.entry.name); @@ -242,7 +242,7 @@ describe('Search Component - Multi-Select Facet', () => { }); it('[C280058] The filter facets items number is updated when another filter facet item is selected', () => { - searchFiltersPage.filterByFileType("Plain Text"); + searchFiltersPage.filterByFileType('Plain Text'); searchFiltersPage.filterByCreator(acsUser.firstName, acsUser.lastName); diff --git a/e2e/pages/adf/navigationBarPage.js b/e2e/pages/adf/navigationBarPage.js index 8ea65b0c83..fc509e0bb9 100644 --- a/e2e/pages/adf/navigationBarPage.js +++ b/e2e/pages/adf/navigationBarPage.js @@ -21,7 +21,7 @@ var TestConfig = require('../../test.config'); var NavigationBarPage = function () { var contentServicesButton = element(by.css("a[data-automation-id='Content Services']")); - var configEditoButton = element(by.css("a[data-automation-id='Config editor']")); + var configEditoButton = element(by.css("a[data-automation-id='Configuration Editor']")); var processServicesButton = element(by.css("a[data-automation-id='Process Services']")); var loginButton = element(by.css("a[data-automation-id='Login']")); var trashcanButton = element(by.css("a[data-automation-id='Trashcan']")); @@ -32,7 +32,7 @@ var NavigationBarPage = function () { var cardViewButton = element(by.cssContainingText(".sidenav-menu-label", "CardView")); var languageMenuButton = element(by.css('button[data-automation-id="language-menu-button"]')); var appTitle = element(by.css('.adf-app-title')); - var headerDataButton = element(by.css("a[data-automation-id='Header data']")); + var headerDataButton = element(by.css("a[data-automation-id='Header Data']")); var menuButton = element(by.css('button[data-automation-id="adf-menu-icon"]')); /** diff --git a/package.json b/package.json index 8c6c96a5b1..2dcc70d583 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "webpack-bundle-analyzer": "webpack-bundle-analyzer demo-shell/dist/stats.json", "test": "ng test dev --watch=false", "e2e": "ng e2e demo-shell-e2e", - "e2e-lib": "npm run lint-e2e && ng e2e lib-e2e --port=4200 ", + "e2e-lib": "ng e2e lib-e2e --port=4200 ", "server-versions": "rimraf ./demo-shell/src/versions.json && npm list --depth=0 --json=true --prod=true > ./demo-shell/src/versions.json || exit 0", "clean": "rimraf dist ./node_modules typings", "clean-lock": "rimraf package-lock.json", diff --git a/scripts/test-e2e-lib.sh b/scripts/test-e2e-lib.sh index c2a8d3a56b..c1ad5dc9fc 100755 --- a/scripts/test-e2e-lib.sh +++ b/scripts/test-e2e-lib.sh @@ -96,6 +96,8 @@ export SAVE_SCREENSHOT=$SAVE_SCREENSHOT export TIMEOUT=$TIMEOUT export FOLDER=$FOLDER'/' +npm run lint-e2e || exit 1 + if [[ $DEVELOPMENT == "true" ]]; then echo "====== Run against local development =====" if [[ $SINGLE_TEST == "true" ]]; then