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

* 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

View File

@@ -16,12 +16,10 @@
*/
import { browser } from 'protractor';
import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -43,8 +41,8 @@ describe('Viewer', () => {
const uploadActions = new UploadActions(this.alfrescoJsApi);
const archiveFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_location
});
beforeAll(async () => {

View File

@@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FileModel } from '../../..//models/ACS/fileModel';
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
@@ -44,13 +43,13 @@ describe('Viewer', () => {
let pngFileUploaded;
const pngFileInfo = 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 otherFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_location
});
beforeAll(async () => {

View File

@@ -20,7 +20,6 @@ import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -34,8 +33,8 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel();
const excelFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_location
});
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',

View File

@@ -20,7 +20,6 @@ import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -39,13 +38,13 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel();
const imgFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_location
});
const imgRenditionFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_location
});
beforeAll(async () => {

View File

@@ -19,7 +19,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -40,8 +39,8 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel();
const pptFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_location
});
beforeAll(async () => {

View File

@@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -39,8 +38,8 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel();
const textFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
});
beforeAll(async () => {

View File

@@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -42,8 +41,8 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel();
const wordFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_location
});
beforeAll(async () => {

View File

@@ -21,7 +21,6 @@ import { ViewerPage } from '../../pages/adf/viewerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../util/constants');
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -42,8 +41,8 @@ describe('Info Drawer', () => {
let pngFileUploaded;
const pngFileInfo = 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
});
beforeAll(async () => {

View File

@@ -16,11 +16,9 @@
*/
import { browser } from 'protractor';
import { LoginPage, UploadActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -36,40 +34,40 @@ describe('Content Services Viewer', () => {
let zoom;
const pdfFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.PDF.first_page_text,
'secondPageText': resources.Files.ADF_DOCUMENTS.PDF.second_page_text,
'lastPageNumber': resources.Files.ADF_DOCUMENTS.PDF.last_page_number
'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF.first_page_text,
'secondPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF.second_page_text,
'lastPageNumber': browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_number
});
const protectedFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.first_page_text,
'secondPageText': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.second_page_text,
'lastPageNumber': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.last_page_number,
'password': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.password,
'location': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_name,
'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.first_page_text,
'secondPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.second_page_text,
'lastPageNumber': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.last_page_number,
'password': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.password,
'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_location
});
const docxFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location,
'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.first_page_text
'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location,
'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name,
'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.first_page_text
});
const jpgFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
'name': resources.Files.ADF_DOCUMENTS.JPG.file_name
'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location,
'name': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_name
});
const mp4File = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.MP4.file_location,
'name': resources.Files.ADF_DOCUMENTS.MP4.file_name
'location': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_location,
'name': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_name
});
const unsupportedFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location,
'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name
'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location,
'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name
});
const pptFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.PPT.file_location,
'name': resources.Files.ADF_DOCUMENTS.PPT.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.PPT.first_page_text
'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_location,
'name': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_name,
'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PPT.first_page_text
});
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',

View File

@@ -19,7 +19,6 @@ import { browser } from 'protractor';
import { LoginPage, UploadActions } from '@alfresco/adf-testing';
import { ViewerPage } from '../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -40,8 +39,8 @@ describe('Viewer', () => {
let txtFileUploaded;
const txtFileInfo = 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
});
beforeAll(async () => {

View File

@@ -22,7 +22,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { MonacoExtensionPage } from '../../pages/adf/demo-shell/monacoExtensionPage';
import CONSTANTS = require('../../util/constants');
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -44,8 +43,8 @@ describe('Viewer', () => {
let jsFileUploaded;
const jsFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.JS.file_name,
'location': resources.Files.ADF_DOCUMENTS.JS.file_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_location
});
beforeAll(async () => {

View File

@@ -20,7 +20,6 @@ import { LoginPage, UploadActions, DataTableComponentPage } from '@alfresco/adf-
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -35,13 +34,13 @@ describe('Viewer - properties', () => {
const dataTable = new DataTableComponentPage();
const pngFile = 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 fileForOverlay = new FileModel({
'name': 'fileForOverlay.png',
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
});
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',

View File

@@ -21,7 +21,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
import CONSTANTS = require('../../util/constants');
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -45,13 +44,13 @@ describe('Viewer', () => {
const shareDialog = new ShareDialog();
const pngFileInfo = 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 wordFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name,
'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location
});
let pngFileShared, wordFileUploaded;