diff --git a/e2e/pages/adf/process-services/tasksPage.ts b/e2e/pages/adf/process-services/tasksPage.ts index 37df788305..eb0ef87899 100644 --- a/e2e/pages/adf/process-services/tasksPage.ts +++ b/e2e/pages/adf/process-services/tasksPage.ts @@ -16,14 +16,13 @@ */ import { StartTaskDialog } from './dialog/startTaskDialog'; -import { FormFields } from './formFields'; import { TaskDetailsPage } from './taskDetailsPage'; import { FiltersPage } from './filtersPage'; import { ChecklistDialog } from './dialog/createChecklistDialog'; import { TasksListPage } from './tasksListPage'; import { element, by } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions, FormFields } from '@alfresco/adf-testing'; export class TasksPage { diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index fe28c4298b..416f8e8ab4 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; -import { Widget } from '../pages/adf/process-services/widgets/widget'; +import { LoginPage, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; @@ -92,7 +91,7 @@ describe('Start Task - Task App', () => { .addForm(app.formName) .clickStartButton(); - widget.attachFileWidget().attachFile(appFields.attachFile_id, pdfFile.location); + widget.attachFileWidget().attachFile(appFields.attachFile_id, TestConfig.main.rootPath + pdfFile.location); widget.attachFileWidget().checkFileIsAttached(appFields.attachFile_id, pdfFile.name); widget.attachFileWidget().viewFile(pdfFile.name); diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index 614205ace7..12fbb8eeec 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; +import { LoginPage, FormFields } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { AttachFormPage } from '../pages/adf/process-services/attachFormPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { FormFields } from '../pages/adf/process-services/formFields'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/dynamic-table-date-picker.e2e.ts b/e2e/process-services/dynamic-table-date-picker.e2e.ts index 411eccf274..2142185918 100644 --- a/e2e/process-services/dynamic-table-date-picker.e2e.ts +++ b/e2e/process-services/dynamic-table-date-picker.e2e.ts @@ -15,11 +15,9 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; +import { LoginPage, Widget } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { DynamicTableWidget } from '../pages/adf/process-services/widgets/dynamicTableWidget'; -import { DropdownWidget } from '../pages/adf/process-services/widgets/dropdownWidget'; import { DatePickerPage } from '../pages/adf/material/datePickerPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -35,9 +33,9 @@ describe('Dynamic Table', () => { const loginPage = new LoginPage(); const processFiltersPage = new ProcessFiltersPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); - const dynamicTable = new DynamicTableWidget(); const datePicker = new DatePickerPage(); const navigationBarPage = new NavigationBarPage(); + const widget = new Widget(); let user, tenantId, appId, apps, users; beforeAll(async(done) => { @@ -106,30 +104,30 @@ describe('Dynamic Table', () => { }); it('[C286277] Should have a datepicker and a mask for DateTime field', () => { - dynamicTable.clickAddButton(); - dynamicTable.clickColumnDateTime(); + widget.dynamicTable().clickAddButton(); + widget.dynamicTable().clickColumnDateTime(); - expect(dynamicTable.addRandomStringOnDateTime(randomText.dateTime)).toBe(''); + expect(widget.dynamicTable().addRandomStringOnDateTime(randomText.dateTime)).toBe(''); }); it('[C286279] Should be able to save row with Date field', () => { - dynamicTable.clickAddButton(); - dynamicTable.addRandomStringOnDate(randomText.date); - dynamicTable.clickSaveButton(); + widget.dynamicTable().clickAddButton(); + widget.dynamicTable().addRandomStringOnDate(randomText.date); + widget.dynamicTable().clickSaveButton(); - expect(dynamicTable.checkErrorMessage()).toBe(randomText.error); + expect(widget.dynamicTable().checkErrorMessage()).toBe(randomText.error); - dynamicTable.clickDateWidget(); + widget.dynamicTable().clickDateWidget(); datePicker.selectTodayDate() .checkDatePickerIsNotDisplayed(); - dynamicTable.clickSaveButton(); - dynamicTable.getTableRow(rowPosition); + widget.dynamicTable().clickSaveButton(); + widget.dynamicTable().getTableRow(rowPosition); }); }); describe('Required Dropdown', () => { const app = resources.Files.APP_DYNAMIC_TABLE_DROPDOWN; - const dropdown = new DropdownWidget(); + const dropdown = widget.dropdown(); beforeAll(async(done) => { @@ -162,10 +160,10 @@ describe('Dynamic Table', () => { it('[C286519] Should be able to save row with required dropdown column', () => { const dropdownOption = 'Option 1'; - dynamicTable.clickAddButton(); + widget.dynamicTable().clickAddButton(); dropdown.selectOption(dropdownOption); - dynamicTable.clickSaveButton(); - dynamicTable.checkItemIsPresent(dropdownOption); + widget.dynamicTable().clickSaveButton(); + widget.dynamicTable().checkItemIsPresent(dropdownOption); }); }); diff --git a/e2e/process-services/form-component.e2e.ts b/e2e/process-services/form-component.e2e.ts index 6eec84bc0a..aeec0defa2 100644 --- a/e2e/process-services/form-component.e2e.ts +++ b/e2e/process-services/form-component.e2e.ts @@ -15,12 +15,8 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; +import { LoginPage, Widget, FormPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { FormPage } from '../pages/adf/process-services/formPage'; -import { DateWidget } from '../pages/adf/process-services/widgets/dateWidget'; -import { AmountWidget } from '../pages/adf/process-services/widgets/amountWidget'; -import { NumberWidget } from '../pages/adf/process-services/widgets/numberWidget'; import TestConfig = require('../test.config'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -31,9 +27,7 @@ describe('Form Component', () => { const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const formPage = new FormPage(); - const dateWidget = new DateWidget(); - const amountWidget = new AmountWidget(); - const numberWidget = new NumberWidget(); + const widget = new Widget(); let tenantId, user; @@ -85,27 +79,27 @@ describe('Form Component', () => { }); it('[C286505] Should be able to display errors under the Error Log section', () => { - numberWidget.getNumberFieldLabel(fields.numberWidgetId); - numberWidget.setFieldValue(fields.numberWidgetId, message.test); + widget.numberWidget().getNumberFieldLabel(fields.numberWidgetId); + widget.numberWidget().setFieldValue(fields.numberWidgetId, message.test); formPage.checkErrorMessageForWidgetIsDisplayed(message.warningNumberAndAmount); formPage.checkErrorLogMessage(message.errorLogNumber); - dateWidget.checkLabelIsVisible(fields.dateWidgetId); - dateWidget.setDateInput(fields.dateWidgetId, message.test); - dateWidget.clickOutsideWidget(fields.dateWidgetId); + widget.dateWidget().checkLabelIsVisible(fields.dateWidgetId); + widget.dateWidget().setDateInput(fields.dateWidgetId, message.test); + widget.dateWidget().clickOutsideWidget(fields.dateWidgetId); formPage.checkErrorMessageForWidgetIsDisplayed(message.warningDate); formPage.checkErrorLogMessage(message.errorLogDate); - amountWidget.getAmountFieldLabel(fields.amountWidgetId); - amountWidget.setFieldValue(fields.amountWidgetId, message.test); + widget.amountWidget().getAmountFieldLabel(fields.amountWidgetId); + widget.amountWidget().setFieldValue(fields.amountWidgetId, message.test); formPage.checkErrorMessageForWidgetIsDisplayed(message.warningNumberAndAmount); formPage.checkErrorLogMessage(message.errorLogAmount); - amountWidget.removeFromAmountWidget(fields.amountWidgetId); + widget.amountWidget().removeFromAmountWidget(fields.amountWidgetId); formPage.checkErrorMessageIsNotDisplayed(message.errorLogAmount); - dateWidget.clearDateInput(fields.dateWidgetId); - numberWidget.clearFieldValue(fields.numberWidgetId); + widget.dateWidget().clearDateInput(fields.dateWidgetId); + widget.numberWidget().clearFieldValue(fields.numberWidgetId); formPage.checkErrorMessageForWidgetIsNotDisplayed(message.warningDate); formPage.checkErrorMessageIsNotDisplayed(message.errorLogDate); formPage.checkErrorLogMessage(message.errorLabel); diff --git a/e2e/process-services/form-people-widget.e2e.ts b/e2e/process-services/form-people-widget.e2e.ts index bf95565e18..0360ac2d31 100644 --- a/e2e/process-services/form-people-widget.e2e.ts +++ b/e2e/process-services/form-people-widget.e2e.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; +import { LoginPage, Widget } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { Widget } from '../pages/adf/process-services/widgets/widget'; import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; diff --git a/e2e/process-services/form-widgets-component.e2e.ts b/e2e/process-services/form-widgets-component.e2e.ts index 52d5dca479..b0d1aab06f 100644 --- a/e2e/process-services/form-widgets-component.e2e.ts +++ b/e2e/process-services/form-widgets-component.e2e.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { Widget } from '../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/widgets/amount-widget.e2e.ts b/e2e/process-services/widgets/amount-widget.e2e.ts index d17124168e..a87214b809 100644 --- a/e2e/process-services/widgets/amount-widget.e2e.ts +++ b/e2e/process-services/widgets/amount-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); diff --git a/e2e/process-services/widgets/attach-folder-widget.e2e.ts b/e2e/process-services/widgets/attach-folder-widget.e2e.ts index 1a7462df59..df71905a63 100644 --- a/e2e/process-services/widgets/attach-folder-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-folder-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/checkbox-widget.e2e.ts b/e2e/process-services/widgets/checkbox-widget.e2e.ts index ba6090abbb..f122a4b029 100644 --- a/e2e/process-services/widgets/checkbox-widget.e2e.ts +++ b/e2e/process-services/widgets/checkbox-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/date-time-widget.e2e.ts b/e2e/process-services/widgets/date-time-widget.e2e.ts index 2861866b39..2df71fd539 100644 --- a/e2e/process-services/widgets/date-time-widget.e2e.ts +++ b/e2e/process-services/widgets/date-time-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/date-widget.e2e.ts b/e2e/process-services/widgets/date-widget.e2e.ts index 3a41ddd604..5cd2a9d97b 100644 --- a/e2e/process-services/widgets/date-widget.e2e.ts +++ b/e2e/process-services/widgets/date-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/document-template-widget.e2e.ts b/e2e/process-services/widgets/document-template-widget.e2e.ts index 76b08d02c8..ba97604301 100644 --- a/e2e/process-services/widgets/document-template-widget.e2e.ts +++ b/e2e/process-services/widgets/document-template-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/dropdown-widget.e2e.ts b/e2e/process-services/widgets/dropdown-widget.e2e.ts index c1f119185e..b2599634f4 100644 --- a/e2e/process-services/widgets/dropdown-widget.e2e.ts +++ b/e2e/process-services/widgets/dropdown-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts index 9e74bcfc65..34dd2f688c 100644 --- a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts +++ b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/header-widget.e2e.ts b/e2e/process-services/widgets/header-widget.e2e.ts index 82e3b8e0f3..5e056f96e0 100644 --- a/e2e/process-services/widgets/header-widget.e2e.ts +++ b/e2e/process-services/widgets/header-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/hyperlink-widget.e2e.ts b/e2e/process-services/widgets/hyperlink-widget.e2e.ts index 8d4917f860..4941a0856c 100644 --- a/e2e/process-services/widgets/hyperlink-widget.e2e.ts +++ b/e2e/process-services/widgets/hyperlink-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/multi-line-widget.e2e.ts b/e2e/process-services/widgets/multi-line-widget.e2e.ts index 5706d728a2..8ab620f3b7 100644 --- a/e2e/process-services/widgets/multi-line-widget.e2e.ts +++ b/e2e/process-services/widgets/multi-line-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/number-widget.e2e.ts b/e2e/process-services/widgets/number-widget.e2e.ts index 8e313ecae0..c44b1003c6 100644 --- a/e2e/process-services/widgets/number-widget.e2e.ts +++ b/e2e/process-services/widgets/number-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); diff --git a/e2e/process-services/widgets/people-widget.e2e.ts b/e2e/process-services/widgets/people-widget.e2e.ts index c903685c8d..0ae32c2687 100644 --- a/e2e/process-services/widgets/people-widget.e2e.ts +++ b/e2e/process-services/widgets/people-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts index 8b093bb1ce..1438950375 100644 --- a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts +++ b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/process-services/widgets/text-widget.e2e.ts b/e2e/process-services/widgets/text-widget.e2e.ts index 66e96a0a4a..785d6956ae 100644 --- a/e2e/process-services/widgets/text-widget.e2e.ts +++ b/e2e/process-services/widgets/text-widget.e2e.ts @@ -18,9 +18,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; -import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; -import { Widget } from '../../pages/adf/process-services/widgets/widget'; import CONSTANTS = require('../../util/constants'); import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); diff --git a/e2e/pages/adf/process-services/formFields.ts b/lib/testing/src/lib/core/pages/form/formFields.ts similarity index 98% rename from e2e/pages/adf/process-services/formFields.ts rename to lib/testing/src/lib/core/pages/form/formFields.ts index bd20bad0c5..cb01ef7fa3 100644 --- a/e2e/pages/adf/process-services/formFields.ts +++ b/lib/testing/src/lib/core/pages/form/formFields.ts @@ -16,7 +16,7 @@ */ import { by, element } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../utils/public-api'; import { ElementFinder } from 'protractor/built/element'; export class FormFields { diff --git a/e2e/pages/adf/process-services/formPage.ts b/lib/testing/src/lib/core/pages/form/formPage.ts similarity index 96% rename from e2e/pages/adf/process-services/formPage.ts rename to lib/testing/src/lib/core/pages/form/formPage.ts index 0684eecde4..21ab039129 100644 --- a/e2e/pages/adf/process-services/formPage.ts +++ b/lib/testing/src/lib/core/pages/form/formPage.ts @@ -16,7 +16,7 @@ */ import { element, by } from 'protractor'; -import { BrowserVisibility } from '@alfresco/adf-testing'; +import { BrowserVisibility } from '../../utils/browser-visibility'; export class FormPage { diff --git a/lib/testing/src/lib/core/pages/form/public-api.ts b/lib/testing/src/lib/core/pages/form/public-api.ts new file mode 100644 index 0000000000..f9243f3478 --- /dev/null +++ b/lib/testing/src/lib/core/pages/form/public-api.ts @@ -0,0 +1,21 @@ +/*! + * @license + * Copyright 2019 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './widgets/public-api'; + +export * from './formFields'; +export * from './formPage'; diff --git a/e2e/pages/adf/process-services/widgets/amountWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts similarity index 96% rename from e2e/pages/adf/process-services/widgets/amountWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts index 5acf93ff98..c91d5f0ff1 100644 --- a/e2e/pages/adf/process-services/widgets/amountWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts @@ -16,7 +16,7 @@ */ import { element, by, protractor } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; import { FormFields } from '../formFields'; export class AmountWidget { diff --git a/e2e/pages/adf/process-services/widgets/attachFileWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts similarity index 85% rename from e2e/pages/adf/process-services/widgets/attachFileWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts index 6a489735d6..7914da8545 100644 --- a/e2e/pages/adf/process-services/widgets/attachFileWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts @@ -16,10 +16,8 @@ */ import { FormFields } from '../formFields'; -import TestConfig = require('../../../../test.config'); -import path = require('path'); -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -import remote = require('selenium-webdriver/remote'); +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; +import * as remote from 'selenium-webdriver/remote'; import { element, by, browser } from 'protractor'; export class AttachFileWidget { @@ -35,7 +33,7 @@ export class AttachFileWidget { const uploadButton = widget.element(this.uploadLocator); BrowserActions.click(uploadButton); BrowserVisibility.waitUntilElementIsVisible(this.localStorageButton); - this.localStorageButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation))); + this.localStorageButton.sendKeys(fileLocation); return this; } diff --git a/e2e/pages/adf/process-services/widgets/checkboxWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts similarity index 95% rename from e2e/pages/adf/process-services/widgets/checkboxWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts index 4fb805dc08..72260387a1 100644 --- a/e2e/pages/adf/process-services/widgets/checkboxWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts @@ -16,7 +16,7 @@ */ import { FormFields } from '../formFields'; -import { BrowserActions } from '@alfresco/adf-testing'; +import { BrowserActions } from '../../../utils/public-api'; import { by, element } from 'protractor'; export class CheckboxWidget { diff --git a/e2e/pages/adf/process-services/widgets/containerWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/containerWidget.ts similarity index 100% rename from e2e/pages/adf/process-services/widgets/containerWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/containerWidget.ts diff --git a/e2e/pages/adf/process-services/widgets/dateTimeWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/dateTimeWidget.ts similarity index 97% rename from e2e/pages/adf/process-services/widgets/dateTimeWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/dateTimeWidget.ts index 1b967dbf6c..5882c919b6 100644 --- a/e2e/pages/adf/process-services/widgets/dateTimeWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/dateTimeWidget.ts @@ -17,7 +17,7 @@ import { FormFields } from '../formFields'; import { element, by, protractor } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; export class DateTimeWidget { diff --git a/e2e/pages/adf/process-services/widgets/dateWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/dateWidget.ts similarity index 96% rename from e2e/pages/adf/process-services/widgets/dateWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/dateWidget.ts index 28ab9cdd5c..03250e2a72 100644 --- a/e2e/pages/adf/process-services/widgets/dateWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/dateWidget.ts @@ -17,7 +17,7 @@ import { FormFields } from '../formFields'; import { element, by, protractor } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; export class DateWidget { diff --git a/e2e/pages/adf/process-services/widgets/displayTextWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/displayTextWidget.ts similarity index 100% rename from e2e/pages/adf/process-services/widgets/displayTextWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/displayTextWidget.ts diff --git a/e2e/pages/adf/process-services/widgets/displayValueWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/displayValueWidget.ts similarity index 100% rename from e2e/pages/adf/process-services/widgets/displayValueWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/displayValueWidget.ts diff --git a/e2e/pages/adf/process-services/widgets/documentWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/documentWidget.ts similarity index 100% rename from e2e/pages/adf/process-services/widgets/documentWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/documentWidget.ts diff --git a/e2e/pages/adf/process-services/widgets/dropdownWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/dropdownWidget.ts similarity index 95% rename from e2e/pages/adf/process-services/widgets/dropdownWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/dropdownWidget.ts index ab1d4d0e75..c8153e7c93 100644 --- a/e2e/pages/adf/process-services/widgets/dropdownWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/dropdownWidget.ts @@ -17,7 +17,7 @@ import { FormFields } from '../formFields'; import { by, element } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; export class DropdownWidget { diff --git a/e2e/pages/adf/process-services/widgets/dynamicTableWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/dynamicTableWidget.ts similarity index 98% rename from e2e/pages/adf/process-services/widgets/dynamicTableWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/dynamicTableWidget.ts index a796b8b07c..7ad14f3dba 100644 --- a/e2e/pages/adf/process-services/widgets/dynamicTableWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/dynamicTableWidget.ts @@ -17,7 +17,7 @@ import { FormFields } from '../formFields'; import { by, element, protractor } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; export class DynamicTableWidget { diff --git a/e2e/pages/adf/process-services/widgets/headerWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/headerWidget.ts similarity index 100% rename from e2e/pages/adf/process-services/widgets/headerWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/headerWidget.ts diff --git a/e2e/pages/adf/process-services/widgets/hyperlinkWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/hyperlinkWidget.ts similarity index 95% rename from e2e/pages/adf/process-services/widgets/hyperlinkWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/hyperlinkWidget.ts index 74aa526e21..ae2b2f25d5 100644 --- a/e2e/pages/adf/process-services/widgets/hyperlinkWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/hyperlinkWidget.ts @@ -17,7 +17,7 @@ import { FormFields } from '../formFields'; import { by, element } from 'protractor'; -import { BrowserActions } from '@alfresco/adf-testing'; +import { BrowserActions } from '../../../utils/public-api'; export class HyperlinkWidget { diff --git a/e2e/pages/adf/process-services/widgets/multilineTextWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/multilineTextWidget.ts similarity index 100% rename from e2e/pages/adf/process-services/widgets/multilineTextWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/multilineTextWidget.ts diff --git a/e2e/pages/adf/process-services/widgets/numberWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/numberWidget.ts similarity index 95% rename from e2e/pages/adf/process-services/widgets/numberWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/numberWidget.ts index 8a12f09a51..a86ecaf5de 100644 --- a/e2e/pages/adf/process-services/widgets/numberWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/numberWidget.ts @@ -17,7 +17,7 @@ import { element, by } from 'protractor'; import { FormFields } from '../formFields'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; export class NumberWidget { diff --git a/e2e/pages/adf/process-services/widgets/peopleWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/peopleWidget.ts similarity index 96% rename from e2e/pages/adf/process-services/widgets/peopleWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/peopleWidget.ts index 41eccf27c5..2468645e40 100644 --- a/e2e/pages/adf/process-services/widgets/peopleWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/peopleWidget.ts @@ -17,7 +17,7 @@ import { FormFields } from '../formFields'; import { by, element } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; export class PeopleWidget { diff --git a/lib/testing/src/lib/core/pages/form/widgets/public-api.ts b/lib/testing/src/lib/core/pages/form/widgets/public-api.ts new file mode 100644 index 0000000000..cf9c9ed215 --- /dev/null +++ b/lib/testing/src/lib/core/pages/form/widgets/public-api.ts @@ -0,0 +1,18 @@ +/*! + * @license + * Copyright 2019 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './widget'; diff --git a/e2e/pages/adf/process-services/widgets/radioButtonsWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/radioButtonsWidget.ts similarity index 95% rename from e2e/pages/adf/process-services/widgets/radioButtonsWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/radioButtonsWidget.ts index 6e51c87856..a59545b5f0 100644 --- a/e2e/pages/adf/process-services/widgets/radioButtonsWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/radioButtonsWidget.ts @@ -17,7 +17,7 @@ import { FormFields } from '../formFields'; import { by, element } from 'protractor'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; export class RadioButtonsWidget { diff --git a/e2e/pages/adf/process-services/widgets/textWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/textWidget.ts similarity index 100% rename from e2e/pages/adf/process-services/widgets/textWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/textWidget.ts diff --git a/e2e/pages/adf/process-services/widgets/widget.ts b/lib/testing/src/lib/core/pages/form/widgets/widget.ts similarity index 100% rename from e2e/pages/adf/process-services/widgets/widget.ts rename to lib/testing/src/lib/core/pages/form/widgets/widget.ts diff --git a/lib/testing/src/lib/core/pages/public-api.ts b/lib/testing/src/lib/core/pages/public-api.ts index c66c2d6c8a..660bf348ec 100644 --- a/lib/testing/src/lib/core/pages/public-api.ts +++ b/lib/testing/src/lib/core/pages/public-api.ts @@ -25,3 +25,5 @@ export * from './data-table-component.page'; export * from './pagination.page'; export * from './error.page'; export * from './login.page'; + +export * from './form/public-api';