inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple option env file (#4788)

Browse Source 
* multi configuration file enabling

* improve ignore

* update i18n tool dep

* update webbpack bundle analyzer version

* fix ps cloud test wait setting

* fix script content

* remove use of testconfig for browser options

* convert protractor to ts

* download browser util fix
This commit is contained in:
Eugenio Romano
2019-05-30 11:15:15 +01:00
committed by GitHub
parent 9aafb80483
commit b91a942aa1
156 changed files with 1227 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/search/components/search-checkList.e2e.ts
+4 -6
View File
@@ -23,8 +23,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { SearchConfiguration } from '../search.config';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -61,10 +59,10 @@ describe('Search Checklist Component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -83,13 +81,13 @@ describe('Search Checklist Component', () => {
await loginPage.loginToContentServicesUsingUserModel(acsUser);
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=' + randomName + '');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=' + randomName + '');
done();
});
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, createdFile.entry.id);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, createdFolder.entry.id);
e2e/search/components/search-date-range.e2e.ts
+2 -4
View File
@@ -24,8 +24,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
import { SearchConfiguration } from '../search.config';
import TestConfig = require('../../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor';
import { DateUtil } from '../../util/dateUtil';
@@ -45,10 +43,10 @@ describe('Search Date Range Filter', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
loginPage.loginToContentServices(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
searchDialog.checkSearchIconIsVisible()
.clickOnSearchIcon()
e2e/search/components/search-number-range.e2e.ts
+2 -4
View File
@@ -22,8 +22,6 @@ import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
import TestConfig = require('../../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '../../actions/ACS/upload.actions';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
@@ -62,10 +60,10 @@ describe('Search Number Range Filter', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/search/components/search-radio.e2e.ts
+4 -6
View File
@@ -23,8 +23,6 @@ import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { SearchConfiguration } from '../search.config';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -63,10 +61,10 @@ describe('Search Radio Component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
@@ -83,13 +81,13 @@ describe('Search Radio Component', () => {
await loginPage.loginToContentServicesUsingUserModel(acsUser);
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=' + randomName);
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=' + randomName);
done();
});
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, createdFile.entry.id);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, createdFolder.entry.id);
e2e/search/components/search-slider.e2e.ts
+2 -4
View File
@@ -22,8 +22,6 @@ import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
import TestConfig = require('../../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '../../actions/ACS/upload.actions';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
@@ -56,10 +54,10 @@ describe('Search Number Range Filter', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/search/components/search-sorting-picker.e2e.ts
+3 -5
View File
@@ -23,8 +23,6 @@ import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { NodeActions } from '../../actions/ACS/node.actions';
import TestConfig = require('../../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '../../actions/ACS/upload.actions';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
@@ -65,10 +63,10 @@ describe('Search Sorting Picker', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -98,7 +96,7 @@ describe('Search Sorting Picker', () => {
});
afterEach(async (done) => {
await BrowserActions.getUrl(TestConfig.adf.url);
await BrowserActions.getUrl(browser.params.testConfig.adf.url);
done();
});
e2e/search/components/search-text.e2e.ts
+4 -6
View File
@@ -20,8 +20,6 @@ import { browser } from 'protractor';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FolderModel } from '../../models/ACS/folderModel';
import TestConfig = require('../../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { LoginPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing';
@@ -48,10 +46,10 @@ describe('Search component - Text widget', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -74,7 +72,7 @@ describe('Search component - Text widget', () => {
});
it('[C289329] Placeholder should be displayed in the widget when the input string is empty', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
searchResultPage.tableIsLoaded();
searchFiltersPage.checkNameFilterIsDisplayed();
@@ -90,7 +88,7 @@ describe('Search component - Text widget', () => {
});
it('[C289330] Should be able to change the Field setting', async () => {
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
searchResultPage.tableIsLoaded();
searchFiltersPage.checkCheckListFilterIsDisplayed();
e2e/search/search-component.e2e.ts
+3 -4
View File
@@ -27,7 +27,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FileModel } from '../models/ACS/fileModel';
import { FolderModel } from '../models/ACS/folderModel';
import TestConfig = require('../test.config');
import { Util } from '../util/util';
import { StringUtil, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing';
@@ -85,10 +84,10 @@ describe('Search component - Search Bar', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
@@ -128,7 +127,7 @@ describe('Search component - Search Bar', () => {
});
afterEach(async (done) => {
await BrowserActions.getUrl(TestConfig.adf.url);
await BrowserActions.getUrl(browser.params.testConfig.adf.url);
done();
});
e2e/search/search-filters.e2e.ts
+7 -8
View File
@@ -23,7 +23,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FileModel } from '../models/ACS/fileModel';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import { StringUtil, DocumentListPage, PaginationPage, LoginPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing';
import resources = require('../util/resources');
@@ -85,10 +84,10 @@ describe('Search Filters', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -141,7 +140,7 @@ describe('Search Filters', () => {
});
it('[C277146] Should Show more/less buttons be hidden when inactive', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
searchFiltersPage.creatorCheckListFiltersPage().checkShowLessButtonIsNotDisplayed()
.checkShowMoreButtonIsDisplayed()
@@ -151,7 +150,7 @@ describe('Search Filters', () => {
});
it('[C286556] Search categories should preserve their collapsed/expanded state after the search', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
searchFiltersPage.clickFileTypeListFilter()
.checkFileTypeFilterIsCollapsed()
@@ -165,7 +164,7 @@ describe('Search Filters', () => {
});
it('[C287796] Should be able to display the correct bucket number after selecting a filter', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
searchFiltersPage.fileTypeCheckListFiltersPage().clickCheckListOption('PNG Image');
@@ -199,7 +198,7 @@ describe('Search Filters', () => {
});
it('[C291980] Should group search facets under specified labels', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
searchFiltersPage.checkDefaultFacetQueryGroupIsDisplayed()
.checkTypeFacetQueryGroupIsDisplayed()
@@ -222,7 +221,7 @@ describe('Search Filters', () => {
});
it('[C297509] Should display search intervals under specified labels from config', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*');
searchFiltersPage.checkFacetIntervalsByCreatedIsDisplayed()
.checkFacetIntervalsByCreatedIsExpanded()
e2e/search/search-multiselect.e2e.ts
+4 -5
View File
@@ -15,7 +15,6 @@
* limitations under the License.
*/
import TestConfig = require('../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { StringUtil } from '@alfresco/adf-testing';
@@ -43,7 +42,7 @@ describe('Search Component - Multi-Select Facet', () => {
beforeAll(() => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
});
@@ -62,7 +61,7 @@ describe('Search Component - Multi-Select Facet', () => {
});
beforeAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -139,7 +138,7 @@ describe('Search Component - Multi-Select Facet', () => {
});
beforeAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(userUploadingTxt);
await this.alfrescoJsApi.core.peopleApi.addPerson(userUploadingImg);
@@ -201,7 +200,7 @@ describe('Search Component - Multi-Select Facet', () => {
});
beforeAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/search/search-page-component.e2e.ts
+3 -4
View File
@@ -27,7 +27,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FolderModel } from '../models/ACS/folderModel';
import { FileModel } from '../models/ACS/fileModel';
import TestConfig = require('../test.config');
import { Util } from '../util/util';
import resources = require('../util/resources');
import { StringUtil } from '@alfresco/adf-testing';
@@ -78,10 +77,10 @@ describe('Search component - Search Page', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
@@ -92,7 +91,7 @@ describe('Search component - Search Page', () => {
await uploadActions.uploadFile(this.alfrescoJsApi, firstFileModel.location, firstFileModel.name, '-my-');
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.createEmptyFiles(this.alfrescoJsApi, adminFileNames, newFolderModelUploaded.entry.id);