From f8c379a0d96ad7b2414cf24eb84f2122c15fd34d Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Sun, 27 Jan 2019 00:25:49 +0000 Subject: [PATCH] fix e2e process service wrong import --- .travis.yml | 2 +- e2e/process-services/task-filters-component.e2e.ts | 2 +- e2e/process-services/task-filters-sorting.e2e.ts | 2 +- scripts/test-e2e-lib.sh | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec27e730e1..44356f10ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -160,7 +160,7 @@ jobs: script: AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e")"; AFFECTED_LIBS="$(./scripts/affected-libs.sh -b $TRAVIS_BRANCH)"; - if [[ $AFFECTED_LIBS =~ "content-services$" || $AFFECTED_E2E = "e2e" ]]; + if [[ $AFFECTED_LIBS =~ "content-services$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; then (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder search --skip-lint --use-dist || exit 1;); fi diff --git a/e2e/process-services/task-filters-component.e2e.ts b/e2e/process-services/task-filters-component.e2e.ts index 70a9dde8c3..72dbf6bd1c 100644 --- a/e2e/process-services/task-filters-component.e2e.ts +++ b/e2e/process-services/task-filters-component.e2e.ts @@ -26,7 +26,7 @@ import { TasksListPage } from '../pages/adf/process-services/tasksListPage'; import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; import { AppNavigationBarPage } from '../pages/adf/process-services/appNavigationBarPage'; import { AppSettingsToggles } from '../pages/adf/process-services/dialog/appSettingsToggles'; -import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/taskFiltersDemoPage'; +import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/taskFiltersDemoPage'; import AlfrescoApi = require('alfresco-js-api-node'); import { AppsActions } from '../actions/APS/apps.actions'; diff --git a/e2e/process-services/task-filters-sorting.e2e.ts b/e2e/process-services/task-filters-sorting.e2e.ts index bc06539a16..2ad99f7f96 100644 --- a/e2e/process-services/task-filters-sorting.e2e.ts +++ b/e2e/process-services/task-filters-sorting.e2e.ts @@ -23,7 +23,7 @@ import { ProcessServicesPage } from '../pages/adf/process-services/processServic import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksListPage } from '../pages/adf/process-services/tasksListPage'; import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; -import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/taskFiltersDemoPage'; +import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/taskFiltersDemoPage'; import AlfrescoApi = require('alfresco-js-api-node'); import { AppsActions } from '../actions/APS/apps.actions'; diff --git a/scripts/test-e2e-lib.sh b/scripts/test-e2e-lib.sh index ad43a018e8..e8ca81bb28 100755 --- a/scripts/test-e2e-lib.sh +++ b/scripts/test-e2e-lib.sh @@ -184,8 +184,3 @@ else ./node_modules/protractor/bin/protractor protractor.conf.js || exit 1 fi fi - - - - -