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

9
e2e/search/components/search-number-range.e2e.ts
View File

@@ -24,7 +24,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { SearchConfiguration } from '../search.config';
describe('Search Number Range Filter', () => {
@@ -40,13 +39,13 @@ describe('Search Number Range Filter', () => {
const acsUser = new AcsUserModel();
const file2BytesModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name,
'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.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
});
let file2Bytes, file0Bytes;

5
e2e/search/components/search-slider.e2e.ts
View File

@@ -24,7 +24,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { SearchConfiguration } from '../search.config';
describe('Search Slider Filter', () => {
@@ -40,8 +39,8 @@ describe('Search Slider Filter', () => {
const acsUser = new AcsUserModel();
const file2BytesModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name,
'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location
});
let file2Bytes;

9
e2e/search/components/search-sorting-picker.e2e.ts
View File

@@ -30,7 +30,6 @@ import { NodeActions } from '../../actions/ACS/node.actions';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { SearchConfiguration } from '../search.config';
describe('Search Sorting Picker', () => {
@@ -46,13 +45,13 @@ describe('Search Sorting Picker', () => {
const acsUser = new AcsUserModel();
const pngAModel = {
'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 pngDModel = {
'name': resources.Files.ADF_DOCUMENTS.PNG_D.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_D.file_location
'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_location
};
let pngA, pngD;

11
e2e/search/search-filters.e2e.ts
View File

@@ -30,7 +30,6 @@ import {
UploadActions,
BrowserActions
} from '@alfresco/adf-testing';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor';
import { SearchConfiguration } from './search.config';
@@ -63,22 +62,22 @@ describe('Search Filters', () => {
});
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 txtFileModel1 = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'name': `${uniqueFileName1}.txt`
});
const jpgFileModel = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location,
'name': `${uniqueFileName2}.jpg`
});
const txtFileModel2 = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'name': `${uniqueFileName3}.txt`
});

11
e2e/search/search-multiselect.e2e.ts
View File

@@ -17,7 +17,6 @@
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { StringUtil, UploadActions, LoginPage } from '@alfresco/adf-testing';
import resources = require('../util/resources');
import CONSTANTS = require('../util/constants');
import { browser } from 'protractor';
import { SearchDialog } from '../pages/adf/dialog/searchDialog';
@@ -47,11 +46,11 @@ describe('Search Component - Multi-Select Facet', () => {
const randomName = StringUtil.generateRandomString();
const jpgFileInfo = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location,
'name': `${randomName}.jpg`
});
const txtFileInfo = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'name': `${randomName}.txt`
});
@@ -137,11 +136,11 @@ describe('Search Component - Multi-Select Facet', () => {
const randomName = StringUtil.generateRandomString();
const jpgFileInfo = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.JPG.file_location,
'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location,
'name': `${randomName}.jpg`
});
const txtFileInfo = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'name': `${randomName}.txt`
});
@@ -199,7 +198,7 @@ describe('Search Component - Multi-Select Facet', () => {
const randomName = StringUtil.generateRandomString();
const txtFileInfo = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location,
'name': `${randomName}.txt`
});

3
e2e/search/search-page-component.e2e.ts
View File

@@ -26,7 +26,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FolderModel } from '../models/ACS/folderModel';
import { FileModel } from '../models/ACS/fileModel';
import { Util } from '../util/util';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@@ -72,7 +71,7 @@ describe('Search component - Search Page', () => {
firstFileModel = new FileModel({
'name': search.active.firstFile,
'location': resources.Files.ADF_DOCUMENTS.TXT.file_location
'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
});
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);