inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4909] e2e - Move the resources as part of protractor params (#5086)

Browse Source 
* Move the resources as part of protractor params

* Revert replace mistakes

* Remove the resources imports

* fix resources import
This commit is contained in:
Maurizio Vitale
2019-10-10 10:22:11 +01:00
committed by Eugenio Romano
parent 6860ab73ab
commit 3fc9390666
129 changed files with 421 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e2e/content-services/directives/download-directive.e2e.ts
View File

@@ -20,7 +20,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import { LoginPage, UploadActions, BrowserVisibility, FileBrowserUtil } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { FolderModel } from '../../models/ACS/folderModel';
@@ -36,27 +35,27 @@ describe('Version component actions', () => {
const txtFileComma = new FileModel({
name: 'comma,name',
location: resources.Files.ADF_DOCUMENTS.TXT.file_location
location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
});
const txtFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TXT.file_name,
location: resources.Files.ADF_DOCUMENTS.TXT.file_location
name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name,
location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
});
const file0BytesModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
});
const folderInfo = new FolderModel({
name: 'myFolder',
location: resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
});
const folderSecond = new FolderModel({
name: 'myrSecondFolder',
location: resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
});
this.alfrescoJsApi = new AlfrescoApi({

5
e2e/content-services/directives/edit-folder-directive.e2e.ts
View File

@@ -23,7 +23,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser, protractor } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
describe('Edit folder directive', () => {
@@ -41,8 +40,8 @@ describe('Edit folder directive', () => {
});
const pdfFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location
name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
});
const uploadActions = new UploadActions(this.alfrescoJsApi);

5
e2e/content-services/directives/favorite-directive.e2e.ts
View File

@@ -22,7 +22,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage';
import { TrashcanPage } from '../../pages/adf/trashcanPage';
@@ -43,8 +42,8 @@ describe('Favorite directive', () => {
hostEcm: browser.params.testConfig.adf_acs.host
});
const pdfFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location
name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
});
const uploadActions = new UploadActions(this.alfrescoJsApi);

13
e2e/content-services/directives/restore-content-directive.e2e.ts
View File

@@ -21,7 +21,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { TrashcanPage } from '../../pages/adf/trashcanPage';
import { LoginPage, NotificationHistoryPage, StringUtil, UploadActions, BrowserActions } from '@alfresco/adf-testing';
@@ -44,18 +43,18 @@ describe('Restore content directive', () => {
});
const pdfFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location
name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
});
const testFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location
name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
});
const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location
name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
});
const folderName = StringUtil.generateRandomString(5);