Skip to content

Commit

Permalink
[ACA-3596] Fix e2e due to process header properties changes (#5873)
Browse files Browse the repository at this point in the history
* [ACA-3596] Fix e2e due to process header properties changes

* Change pages structure

* Move the build demoshell as last step and exclude for PR

* move more pages

* change testing pkg

* better JSON import

* update script

* move CLOUD in the right place

* some logs and not used methods

* retrycout

Co-authored-by: maurizio vitale <maurizio.vitale@alfresco.com>
Co-authored-by: Eugenio Romano <eugenio.romano@alfresco.com>
Co-authored-by: Eugenio Romano <eromano@users.noreply.github.com>
  • Loading branch information
4 people committed Jul 16, 2020
1 parent 33965d0 commit b9dc285
Show file tree
Hide file tree
Showing 234 changed files with 571 additions and 584 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ branches:
- /.*old-env.*/
- /.*next-release.*/
- /.*beta.*/
- /.*greenkeeper.*/

stages:
- name: Lint & Build Dist & Release
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
import { AboutPage, ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';

describe('About Content Services', () => {

Expand Down
6 changes: 3 additions & 3 deletions e2e/content-services/comments/comment-component.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import {
UsersActions,
ViewerPage
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { CommentsPage } from '../../pages/adf/comments.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { CommentsPage } from '../../core/pages/comments.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor';
import CONSTANTS = require('../../util/constants');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import {
UserModel,
UsersActions
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { FolderDialogPage } from '../../pages/adf/dialog/folder-dialog.page';
import { MetadataViewPage } from '../../pages/adf/metadata-view.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { FolderDialogPage } from '../../core/pages/dialog/folder-dialog.page';
import { MetadataViewPage } from '../../core/pages/metadata-view.page';
import { browser, Key } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

describe('Create folder directive', () => {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/

import { ApiService, BrowserActions, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { CreateLibraryDialogPage } from '../../pages/adf/dialog/create-library-dialog.page';
import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { CreateLibraryDialogPage } from '../../core/pages/dialog/create-library-dialog.page';
import { CustomSourcesPage } from '../../core/pages/custom-sources.page';
import { browser } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

describe('Create library directive', () => {

Expand Down
2 changes: 1 addition & 1 deletion e2e/content-services/directives/delete-directive.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { FileModel } from '../../models/ACS/file.model';
import {
ApiService,
Expand Down
4 changes: 2 additions & 2 deletions e2e/content-services/directives/download-directive.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { FileModel } from '../../models/ACS/file.model';
import {
ApiService,
Expand All @@ -27,7 +27,7 @@ import {
UsersActions
} from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FolderModel } from '../../models/ACS/folder.model';

describe('Version component actions', () => {
Expand Down
6 changes: 3 additions & 3 deletions e2e/content-services/directives/edit-folder-directive.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import {
UserModel,
UsersActions
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { FolderDialogPage } from '../../pages/adf/dialog/folder-dialog.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { FolderDialogPage } from '../../core/pages/dialog/folder-dialog.page';
import { browser, protractor } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FileModel } from '../../models/ACS/file.model';

describe('Edit folder directive', () => {
Expand Down
8 changes: 4 additions & 4 deletions e2e/content-services/directives/favorite-directive.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import {
UserModel,
UsersActions
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';

import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page';
import { TrashcanPage } from '../../pages/adf/trashcan.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { CustomSourcesPage } from '../../core/pages/custom-sources.page';
import { TrashcanPage } from '../../core/pages/trashcan.page';

describe('Favorite directive', () => {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* limitations under the License.
*/

import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';

import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { TrashcanPage } from '../../pages/adf/trashcan.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TrashcanPage } from '../../core/pages/trashcan.page';
import {
ApiService,
BreadcrumbPage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import {
UsersActions,
ViewerPage
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FileModel } from '../../models/ACS/file.model';
import { BreadCrumbDropdownPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page';
import { InfinitePaginationPage } from '../../pages/adf/core/infinite-pagination.page';
import { BreadCrumbDropdownPage } from '../pages/breadcrumb/bread-crumb-dropdown.page';
import { InfinitePaginationPage } from '../../core/pages/infinite-pagination.page';
import { FolderModel } from '../../models/ACS/folder.model';

describe('Document List Component - Actions', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { browser } from 'protractor';
import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions, ViewerPage } from '@alfresco/adf-testing';
import { FileModel } from '../../models/ACS/file.model';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import {
UserModel,
UsersActions
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FileModel } from '../../models/ACS/file.model';
import CONSTANTS = require('../../util/constants');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* limitations under the License.
*/

import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { browser } from 'protractor';
import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

describe('Document List Component', () => {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import {
UserModel,
UsersActions
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FolderModel } from '../../models/ACS/folder.model';
import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/file.model';
import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page';
import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';

describe('Document List - Pagination', () => {
const pagination = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/

import { browser } from 'protractor';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ApiService, BrowserActions, ErrorPage, LoginPage, StringUtil, UsersActions } from '@alfresco/adf-testing';

describe('Document List Component', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/

import { ApiService, DropActions, LoginPage, UploadActions, UsersActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/file.model';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
*/

import { ApiService, LoginPage, PaginationPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FolderModel } from '../../models/ACS/folder.model';
import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/file.model';
import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page';
import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';

describe('Document List - Selection', () => {
const loginPage = new LoginPage();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* limitations under the License.
*/

import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { browser } from 'protractor';
import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

describe('Document List Component', () => {

Expand Down
6 changes: 3 additions & 3 deletions e2e/content-services/lock-file.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/

import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../pages/adf/content-services.page';
import { LockFilePage } from '../pages/adf/lock-file.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
import { ContentServicesPage } from '../core/pages/content-services.page';
import { LockFilePage } from '../content-services/pages/lock-file.page';
import { FileModel } from '../models/ACS/file.model';
import { browser } from 'protractor';
import CONSTANTS = require('../util/constants');
Expand Down
6 changes: 3 additions & 3 deletions e2e/content-services/metadata/aspect-oriented-config.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import {
UsersActions,
ViewerPage
} from '@alfresco/adf-testing';
import { MetadataViewPage } from '../../pages/adf/metadata-view.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { MetadataViewPage } from '../../core/pages/metadata-view.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';

describe('Aspect oriented config', () => {

Expand Down
4 changes: 2 additions & 2 deletions e2e/content-services/metadata/metadata-permissions.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import {
UsersActions,
ViewerPage
} from '@alfresco/adf-testing';
import { MetadataViewPage } from '../../pages/adf/metadata-view.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { MetadataViewPage } from '../../core/pages/metadata-view.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor';
import CONSTANTS = require('../../util/constants');
Expand Down
6 changes: 3 additions & 3 deletions e2e/content-services/metadata/metadata-properties.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import {
UsersActions,
ViewerPage
} from '@alfresco/adf-testing';
import { MetadataViewPage } from '../../pages/adf/metadata-view.page';
import { MetadataViewPage } from '../../core/pages/metadata-view.page';
import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';

describe('CardView Component - properties', () => {

Expand Down
6 changes: 3 additions & 3 deletions e2e/content-services/metadata/metadata-smoke-tests.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import {
UsersActions,
ViewerPage
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { MetadataViewPage } from '../../pages/adf/metadata-view.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { MetadataViewPage } from '../../core/pages/metadata-view.page';
import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import moment = require('moment');

describe('Metadata component', () => {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions e2e/content-services/permissions/permissions-component.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
* limitations under the License.
*/

import { PermissionsPage } from '../../pages/adf/permissions.page';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { PermissionsPage } from '../../content-services/pages/permissions.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { FileModel } from '../../models/ACS/file.model';
import {
ApiService,
Expand All @@ -31,9 +31,9 @@ import {
} from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { FolderModel } from '../../models/ACS/folder.model';
import { MetadataViewPage } from '../../pages/adf/metadata-view.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page';
import { MetadataViewPage } from '../../core/pages/metadata-view.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';

describe('Permissions Component', () => {

Expand Down
12 changes: 6 additions & 6 deletions e2e/content-services/permissions/site-permissions.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import { PermissionsPage } from '../../pages/adf/permissions.page';
import { PermissionsPage } from '../../content-services/pages/permissions.page';
import {
ApiService,
BrowserActions,
Expand All @@ -27,13 +27,13 @@ import {
UsersActions,
ViewerPage
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor';
import { MetadataViewPage } from '../../pages/adf/metadata-view.page';
import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { VersionManagePage } from '../../pages/adf/version-manager.page';
import { MetadataViewPage } from '../../core/pages/metadata-view.page';
import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { VersionManagePage } from '../../core/pages/version-manager.page';
import CONSTANTS = require('../../util/constants');

describe('Permissions Component', () => {
Expand Down
8 changes: 4 additions & 4 deletions e2e/content-services/share-file/share-file.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ import {
UsersActions,
ViewerPage
} from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/content-services.page';
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
import { ShareDialogPage } from '../../pages/adf/dialog/share-dialog.page';
import { ContentServicesPage } from '../../core/pages/content-services.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ShareDialogPage } from '../../core/pages/dialog/share-dialog.page';
import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor';
import { SharedLinkEntry, SharedLinkPaging } from '@alfresco/js-api';
import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page';
import { CustomSourcesPage } from '../../core/pages/custom-sources.page';

describe('Share file', () => {

Expand Down

0 comments on commit b9dc285

Please sign in to comment.