mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2026-09-09 18:03:21 +00:00
[ADF-3442] create library dialog (#4018)
* library dialog * integrate with demo shell * update resources * fix license * auto focus for the first input * update e2e tests * try close the dialog between tests * fix afterEach * Revert "try close the dialog between tests" This reverts commit 63464f2b03c226c606d09b18c7d2782e3bb52c0a. * update code due to css lint issues * csslint settings for vs code * missing import lint fix remove not used import convert errorPage js to ts convert tasklistpage js to ts fix redirection creation folder in root fix lint issue fix e2e * e2e fix * fix PS tests * navigation import * fix tests tooltip convert paginapage to ts * fix lint * fix lock files e2e filterspage to ts * fix lint * fix cs cre git dept 3 and not 50 as default in travis * quiet log git download * add some delay and change the delete lock * fix node entry * convert searchDialog to typescript parallel protractor * disable browser execute * restote test * change search tests * move search in a separate e2e folder * experiment fix e2e * change util presence change protractor conf * fix unshare test * improve query viewerPage using css over xpath * waitForAngularEnabled before browser redirect * convert util to ts and more * convert other files to ts * convert to ts other files * trigger build * function fixes use arrow function * process service fixes * lint fix review timeout default * fix failing tests * restore timeout * share dialog fix * remove * use configuration admin * fix APS 2 login sso
This commit is contained in:
Denys Vuika
committed by
Eugenio Romano
Eugenio Romano
parent
9fd564a78e
commit
058d23d57f
@@ -19,12 +19,12 @@ import { browser } from 'protractor';
|
||||
|
||||
import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import { ViewerPage } from '../../pages/adf/viewerPage';
|
||||
import CardViewPage = require('../../pages/adf/metadataViewPage');
|
||||
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
import { ConfigEditorPage } from '../../pages/adf/configEditorPage';
|
||||
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import FileModel = require('../../models/ACS/fileModel');
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
import { FileModel } from '../../models/ACS/fileModel';
|
||||
|
||||
import TestConfig = require('../../test.config');
|
||||
import resources = require('../../util/resources');
|
||||
@@ -37,7 +37,7 @@ describe('Aspect oriented config', () => {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const viewerPage = new ViewerPage();
|
||||
const metadataViewPage = new CardViewPage();
|
||||
const metadataViewPage = new MetadataViewPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const configEditorPage = new ConfigEditorPage();
|
||||
let contentServicesPage = new ContentServicesPage();
|
||||
@@ -71,13 +71,13 @@ describe('Aspect oriented config', () => {
|
||||
done();
|
||||
});
|
||||
|
||||
beforeEach(async(done) => {
|
||||
beforeEach(async (done) => {
|
||||
navigationBarPage.clickConfigEditorButton();
|
||||
configEditorPage.clickClearButton();
|
||||
done();
|
||||
});
|
||||
|
||||
afterEach(async(done) => {
|
||||
afterEach(async (done) => {
|
||||
viewerPage.clickCloseButton();
|
||||
contentServicesPage.checkAcsContainer();
|
||||
browser.refresh();
|
||||
@@ -96,7 +96,8 @@ describe('Aspect oriented config', () => {
|
||||
' }' +
|
||||
' ]' +
|
||||
' }]' +
|
||||
' }');
|
||||
' }' +
|
||||
' }');
|
||||
|
||||
configEditorPage.clickSaveButton();
|
||||
|
||||
@@ -148,7 +149,7 @@ describe('Aspect oriented config', () => {
|
||||
metadataViewPage.checkMetadataGroupIsNotPresent('exists');
|
||||
});
|
||||
|
||||
it('[C260183] Should show all the aspect if the content-metadata configuration is NOT provided' , () => {
|
||||
it('[C260183] Should show all the aspect if the content-metadata configuration is NOT provided', () => {
|
||||
|
||||
configEditorPage.enterConfiguration('{ }');
|
||||
|
||||
@@ -172,7 +173,7 @@ describe('Aspect oriented config', () => {
|
||||
metadataViewPage.checkMetadataGroupIsPresent('Content');
|
||||
});
|
||||
|
||||
it('[C260182] Should show all the aspects if the default configuration contains the star symbol' , () => {
|
||||
it('[C260182] Should show all the aspects if the default configuration contains the star symbol', () => {
|
||||
|
||||
configEditorPage.enterConfiguration('{' +
|
||||
' "presets": {' +
|
||||
@@ -201,7 +202,7 @@ describe('Aspect oriented config', () => {
|
||||
metadataViewPage.checkMetadataGroupIsPresent('Content');
|
||||
});
|
||||
|
||||
it('[C268899] Should be possible use a Translation key as Title of a metadata group' , () => {
|
||||
it('[C268899] Should be possible use a Translation key as Title of a metadata group', () => {
|
||||
|
||||
configEditorPage.enterConfiguration('{' +
|
||||
' "presets": {' +
|
||||
@@ -251,7 +252,7 @@ describe('Aspect oriented config', () => {
|
||||
|
||||
});
|
||||
|
||||
it('[C279968] Should be possible use a custom preset' , () => {
|
||||
it('[C279968] Should be possible use a custom preset', () => {
|
||||
|
||||
configEditorPage.enterConfiguration('{' +
|
||||
' "presets": {' +
|
||||
|
||||
@@ -19,22 +19,21 @@ import { element, by } from 'protractor';
|
||||
|
||||
import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
|
||||
import CardViewPage = require('../../pages/adf/metadataViewPage');
|
||||
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
|
||||
|
||||
import TestConfig = require('../../test.config');
|
||||
import resources = require('../../util/resources');
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { UsersActions } from '../../actions/users.actions';
|
||||
import { AppsActions } from '../../actions/APS/apps.actions';
|
||||
import CardViewPageComponent = require('../../pages/adf/cardViewPageComponent');
|
||||
import Util = require('../../util/util');
|
||||
import { CardViewComponentPage } from '../../pages/adf/cardViewComponentPage';
|
||||
import { Util } from '../../util/util';
|
||||
|
||||
describe('CardView Component', () => {
|
||||
const loginPage = new LoginPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const cardViewPageComponent = new CardViewPageComponent();
|
||||
const metadataViewPage = new CardViewPage();
|
||||
const cardViewPageComponent = new CardViewComponentPage();
|
||||
const metadataViewPage = new MetadataViewPage();
|
||||
|
||||
const app = resources.Files.APP_WITH_PROCESSES;
|
||||
|
||||
@@ -69,7 +68,7 @@ describe('CardView Component', () => {
|
||||
describe('key-value pair ', () => {
|
||||
|
||||
it('[C279938] Should the label be present', () => {
|
||||
let label = element(by.xpath('div[data-automation-id="card-key-value-pairs-label-key-value-pairs"]'));
|
||||
let label = element(by.css('div[data-automation-id="card-key-value-pairs-label-key-value-pairs"]'));
|
||||
|
||||
Util.waitUntilElementIsPresent(label);
|
||||
});
|
||||
@@ -91,7 +90,7 @@ describe('CardView Component', () => {
|
||||
describe('SelectBox', () => {
|
||||
|
||||
it('[C279939] Should the label be present', () => {
|
||||
let label = element(by.xpath('div[data-automation-id="card-select-label-select"]'));
|
||||
let label = element(by.css('div[data-automation-id="card-select-label-select"]'));
|
||||
|
||||
Util.waitUntilElementIsPresent(label);
|
||||
});
|
||||
@@ -108,7 +107,7 @@ describe('CardView Component', () => {
|
||||
describe('Text', () => {
|
||||
|
||||
it('[C279937] Should the label be present', () => {
|
||||
let label = element(by.xpath('div[data-automation-id="card-textitem-label-name"]'));
|
||||
let label = element(by.css('div[data-automation-id="card-textitem-label-name"]'));
|
||||
|
||||
Util.waitUntilElementIsPresent(label);
|
||||
});
|
||||
@@ -139,7 +138,7 @@ describe('CardView Component', () => {
|
||||
describe('Int', () => {
|
||||
|
||||
it('[C279940] Should the label be present', () => {
|
||||
let label = element(by.xpath('div[data-automation-id="card-textitem-label-int"]'));
|
||||
let label = element(by.css('div[data-automation-id="card-textitem-label-int"]'));
|
||||
|
||||
Util.waitUntilElementIsPresent(label);
|
||||
});
|
||||
@@ -213,7 +212,7 @@ describe('CardView Component', () => {
|
||||
describe('Float', () => {
|
||||
|
||||
it('[C279941] Should the label be present', () => {
|
||||
let label = element(by.xpath('div[data-automation-id="card-textitem-label-float"]'));
|
||||
let label = element(by.css('div[data-automation-id="card-textitem-label-float"]'));
|
||||
|
||||
Util.waitUntilElementIsPresent(label);
|
||||
});
|
||||
@@ -263,7 +262,7 @@ describe('CardView Component', () => {
|
||||
describe('Boolean', () => {
|
||||
|
||||
it('[C279942] Should the label be present', () => {
|
||||
let label = element(by.xpath('div[data-automation-id="card-boolean-label-boolean"]'));
|
||||
let label = element(by.css('div[data-automation-id="card-boolean-label-boolean"]'));
|
||||
|
||||
Util.waitUntilElementIsPresent(label);
|
||||
});
|
||||
@@ -282,11 +281,11 @@ describe('CardView Component', () => {
|
||||
describe('Date and DateTime', () => {
|
||||
|
||||
it('[C279961] Should the label be present', () => {
|
||||
let labelDate = element(by.xpath('div[data-automation-id="card-dateitem-label-date"]'));
|
||||
let labelDate = element(by.css('div[data-automation-id="card-dateitem-label-date"]'));
|
||||
|
||||
Util.waitUntilElementIsPresent(labelDate);
|
||||
|
||||
let labelDatetime = element(by.xpath('div[data-automation-id="card-dateitem-label-datetime"]'));
|
||||
let labelDatetime = element(by.css('div[data-automation-id="card-dateitem-label-datetime"]'));
|
||||
|
||||
Util.waitUntilElementIsPresent(labelDatetime);
|
||||
});
|
||||
@@ -301,11 +300,11 @@ describe('CardView Component', () => {
|
||||
it('[C279936] Should not be possible edit any parameter when editable property is false', () => {
|
||||
cardViewPageComponent.disableEdit();
|
||||
|
||||
let editIconText = element(by.xpath('mat-icon[data-automation-id="card-textitem-edit-icon-name"]'));
|
||||
let editIconInt = element(by.xpath('mat-icon[data-automation-id="card-textitem-edit-icon-int"]'));
|
||||
let editIconFloat = element(by.xpath('mat-icon[data-automation-id="card-textitem-edit-icon-float"]'));
|
||||
let editIconKey = element(by.xpath('mat-icon[data-automation-id="card-key-value-pairs-button-key-value-pairs"]'));
|
||||
let editIconData = element(by.xpath('mat-datetimepicker-toggle'));
|
||||
let editIconText = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-name"]'));
|
||||
let editIconInt = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-int"]'));
|
||||
let editIconFloat = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-float"]'));
|
||||
let editIconKey = element(by.css('mat-icon[data-automation-id="card-key-value-pairs-button-key-value-pairs"]'));
|
||||
let editIconData = element(by.css('mat-datetimepicker-toggle'));
|
||||
|
||||
Util.waitUntilElementIsNotVisible(editIconText);
|
||||
Util.waitUntilElementIsNotVisible(editIconInt);
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import { ViewerPage } from '../../pages/adf/viewerPage';
|
||||
import CardViewPage = require('../../pages/adf/metadataViewPage');
|
||||
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import FileModel = require('../../models/ACS/fileModel');
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
import { FileModel } from '../../models/ACS/fileModel';
|
||||
|
||||
import TestConfig = require('../../test.config');
|
||||
import resources = require('../../util/resources');
|
||||
@@ -29,7 +29,7 @@ import resources = require('../../util/resources');
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { UploadActions } from '../../actions/ACS/upload.actions';
|
||||
|
||||
import Util = require('../../util/util');
|
||||
import { Util } from '../../util/util';
|
||||
import CONSTANTS = require('../../util/constants');
|
||||
|
||||
describe('permissions', () => {
|
||||
@@ -49,7 +49,7 @@ describe('permissions', () => {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const viewerPage = new ViewerPage();
|
||||
const metadataViewPage = new CardViewPage();
|
||||
const metadataViewPage = new MetadataViewPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
|
||||
let consumerUser = new AcsUserModel();
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
|
||||
import { ViewerPage } from '../../pages/adf/viewerPage';
|
||||
import CardViewPage = require('../../pages/adf/metadataViewPage');
|
||||
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
|
||||
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import FileModel = require('../../models/ACS/fileModel');
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
import { FileModel } from '../../models/ACS/fileModel';
|
||||
|
||||
import TestConfig = require('../../test.config');
|
||||
import resources = require('../../util/resources');
|
||||
@@ -47,7 +47,7 @@ describe('CardView Component - properties', () => {
|
||||
let loginPage = new LoginPage();
|
||||
let contentServicesPage = new ContentServicesPage();
|
||||
let viewerPage = new ViewerPage();
|
||||
let metadataViewPage = new CardViewPage();
|
||||
let metadataViewPage = new MetadataViewPage();
|
||||
|
||||
let acsUser = new AcsUserModel();
|
||||
|
||||
|
||||
@@ -20,11 +20,11 @@ import { browser } from 'protractor';
|
||||
import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
|
||||
import { ViewerPage } from '../../pages/adf/viewerPage';
|
||||
import CardViewPage = require('../../pages/adf/metadataViewPage');
|
||||
import ContentListPage = require('../../pages/adf/dialog/contentList');
|
||||
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
|
||||
import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
|
||||
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import FileModel = require('../../models/ACS/fileModel');
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
import { FileModel } from '../../models/ACS/fileModel';
|
||||
|
||||
import TestConfig = require('../../test.config');
|
||||
import resources = require('../../util/resources');
|
||||
@@ -51,7 +51,7 @@ describe('Metadata component', () => {
|
||||
const loginPage = new LoginPage();
|
||||
const contentServicesPage = new ContentServicesPage();
|
||||
const viewerPage = new ViewerPage();
|
||||
const metadataViewPage = new CardViewPage();
|
||||
const metadataViewPage = new MetadataViewPage();
|
||||
const contentListPage = new ContentListPage();
|
||||
|
||||
let acsUser = new AcsUserModel();
|
||||
|
||||
@@ -16,17 +16,19 @@
|
||||
*/
|
||||
|
||||
import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import DataTablePage = require('../../pages/adf/dataTablePage');
|
||||
import { DataTablePage } from '../../pages/adf/dataTablePage';
|
||||
import TestConfig = require('../../test.config');
|
||||
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
|
||||
describe('Datatable component - selection', () => {
|
||||
|
||||
let dataTablePage = new DataTablePage();
|
||||
let loginPage = new LoginPage();
|
||||
let acsUser = new AcsUserModel();
|
||||
let navigationBarPage = new NavigationBarPage();
|
||||
|
||||
beforeAll(async (done) => {
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
@@ -40,7 +42,7 @@ describe('Datatable component - selection', () => {
|
||||
|
||||
loginPage.loginToContentServicesUsingUserModel(acsUser);
|
||||
|
||||
dataTablePage.goToDatatable();
|
||||
navigationBarPage.navigateToDatatable();
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
@@ -16,17 +16,19 @@
|
||||
*/
|
||||
|
||||
import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import DataTablePage = require('../../pages/adf/dataTablePage');
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import { DataTablePage } from '../../pages/adf/dataTablePage';
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
import TestConfig = require('../../test.config');
|
||||
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
|
||||
describe('Datatable component', () => {
|
||||
|
||||
let dataTablePage = new DataTablePage();
|
||||
let loginPage = new LoginPage();
|
||||
let acsUser = new AcsUserModel();
|
||||
let navigationBarPage = new NavigationBarPage();
|
||||
|
||||
beforeAll(async (done) => {
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
@@ -40,7 +42,7 @@ describe('Datatable component', () => {
|
||||
|
||||
loginPage.loginToContentServicesUsingUserModel(acsUser);
|
||||
|
||||
dataTablePage.goToDatatable();
|
||||
navigationBarPage.navigateToDatatable();
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
@@ -16,10 +16,10 @@
|
||||
*/
|
||||
|
||||
import { LoginPage } from '../pages/adf/loginPage';
|
||||
import AcsUserModel = require('../models/ACS/acsUserModel');
|
||||
import { AcsUserModel } from '../models/ACS/acsUserModel';
|
||||
import TestConfig = require('../test.config');
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import ErrorPage = require('../pages/adf/errorPage');
|
||||
import { ErrorPage } from '../pages/adf/errorPage';
|
||||
import { browser } from '../../node_modules/protractor';
|
||||
|
||||
describe('Error Component', () => {
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
import { LoginPage } from '../pages/adf/loginPage';
|
||||
import { ContentServicesPage } from '../pages/adf/contentServicesPage';
|
||||
|
||||
import AcsUserModel = require('../models/ACS/acsUserModel');
|
||||
import FolderModel = require('../models/ACS/folderModel');
|
||||
import { AcsUserModel } from '../models/ACS/acsUserModel';
|
||||
import { FolderModel } from '../models/ACS/folderModel';
|
||||
|
||||
import TestConfig = require('../test.config');
|
||||
import Util = require('../util/util');
|
||||
import { Util } from '../util/util';
|
||||
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { UploadActions } from '../actions/ACS/upload.actions';
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { LoginAPSPage } from '../../../pages/adf/loginApsPage';
|
||||
import { LoginSSOPage } from '../../../pages/adf/loginSSOPage';
|
||||
import { SettingsPage } from '../../../pages/adf/settingsPage';
|
||||
import TestConfig = require('../../../test.config');
|
||||
import { browser } from 'protractor';
|
||||
import { NavigationBarPage } from '../../../pages/adf/NavigationBarPage';
|
||||
import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
|
||||
|
||||
describe('Login component - SSO', () => {
|
||||
|
||||
const settingsPage = new SettingsPage();
|
||||
const loginApsPage = new LoginAPSPage();
|
||||
const loginApsPage = new LoginSSOPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const path = '/auth/realms/springboot';
|
||||
let silentLogin;
|
||||
@@ -33,19 +33,17 @@ describe('Login component - SSO', () => {
|
||||
navigationBarPage.clickLogoutButton();
|
||||
browser.executeScript('window.sessionStorage.clear();');
|
||||
browser.executeScript('window.localStorage.clear();');
|
||||
});
|
||||
|
||||
it('[C261050] Should be possible login in the PS with SSO', async () => {
|
||||
silentLogin = false;
|
||||
await settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path, silentLogin);
|
||||
await loginApsPage.clickOnSSOButton();
|
||||
browser.ignoreSynchronization = true;
|
||||
await loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
});
|
||||
|
||||
it ('[C280667] Should be redirect directly to keycloak without show the login page with silent login', async () => {
|
||||
await settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path);
|
||||
browser.ignoreSynchronization = true;
|
||||
await loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
it('[C261050] Should be possible login in the PS with SSO', () => {
|
||||
silentLogin = false;
|
||||
settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path, silentLogin);
|
||||
loginApsPage.clickOnSSOButton();
|
||||
loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
});
|
||||
|
||||
it('[C280667] Should be redirect directly to keycloak without show the login page with silent login', () => {
|
||||
settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path);
|
||||
loginApsPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -25,12 +25,12 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
import { UserInfoDialog } from '../../pages/adf/dialog/userInfoDialog';
|
||||
|
||||
import TestConfig = require('../../test.config');
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
|
||||
import { SettingsPage } from '../../pages/adf/settingsPage';
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
|
||||
import Util = require('../../util/util');
|
||||
import { Util } from '../../util/util';
|
||||
|
||||
describe('Login component', () => {
|
||||
|
||||
@@ -234,7 +234,6 @@ describe('Login component', () => {
|
||||
|
||||
browser.getAllWindowHandles().then((handles) => {
|
||||
|
||||
browser.ignoreSynchronization = true;
|
||||
browser.switchTo().window(handles[1]).then(() => {
|
||||
browser.get(TestConfig.adf.url + '/activiti');
|
||||
processServicesPage.checkApsContainer();
|
||||
|
||||
@@ -23,13 +23,13 @@ import { ProcessServicesPage } from '../../pages/adf/process_services/processSer
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
|
||||
import TestConfig = require('../../test.config');
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
|
||||
import { SettingsPage } from '../../pages/adf/settingsPage';
|
||||
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
|
||||
import Util = require('../../util/util');
|
||||
import { Util } from '../../util/util';
|
||||
import { UploadActions } from '../../actions/ACS/upload.actions';
|
||||
|
||||
describe('Login component - Redirect', () => {
|
||||
@@ -40,14 +40,17 @@ describe('Login component - Redirect', () => {
|
||||
let contentServicesPage = new ContentServicesPage();
|
||||
let loginPage = new LoginPage();
|
||||
let user = new AcsUserModel();
|
||||
let userFolderOwner = new AcsUserModel();
|
||||
let adminUserModel = new AcsUserModel({
|
||||
'id': TestConfig.adf.adminUser,
|
||||
'password': TestConfig.adf.adminPassword
|
||||
});
|
||||
let uploadedFolder;
|
||||
let uploadActions = new UploadActions();
|
||||
|
||||
beforeAll(async (done) => {
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
provider: 'ALL',
|
||||
provider: 'ECM',
|
||||
hostEcm: TestConfig.adf.url,
|
||||
hostBpm: TestConfig.adf.url
|
||||
});
|
||||
@@ -55,6 +58,11 @@ describe('Login component - Redirect', () => {
|
||||
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
|
||||
await this.alfrescoJsApi.core.peopleApi.addPerson(user);
|
||||
await this.alfrescoJsApi.core.peopleApi.addPerson(userFolderOwner);
|
||||
|
||||
await this.alfrescoJsApi.login(user.id, user.password);
|
||||
|
||||
uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, 'protecteFolder' + Util.generateRandomString(), '-my-');
|
||||
|
||||
done();
|
||||
});
|
||||
@@ -100,16 +108,10 @@ describe('Login component - Redirect', () => {
|
||||
});
|
||||
|
||||
it('[C260088] Should be re-redirect to the request URL after login when try to access to a protect URL ', () => {
|
||||
let uploadActions = new UploadActions();
|
||||
|
||||
let uploadedFolder;
|
||||
let folderName = Util.generateRandomString();
|
||||
|
||||
settingsPage.setProviderEcm();
|
||||
loginPage.login(user.id, user.password);
|
||||
|
||||
browser.controlFlow().execute(async () => {
|
||||
uploadedFolder = await uploadActions.uploadFolder(this.alfrescoJsApi, folderName, '-my-');
|
||||
|
||||
navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
|
||||
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
import { LoginPage } from '../pages/adf/loginPage';
|
||||
import { ContentServicesPage } from '../pages/adf/contentServicesPage';
|
||||
import PaginationPage = require('../pages/adf/paginationPage');
|
||||
import { PaginationPage } from '../pages/adf/paginationPage';
|
||||
import { Util } from '../util/util';
|
||||
|
||||
import AcsUserModel = require('../models/ACS/acsUserModel');
|
||||
import FolderModel = require('../models/ACS/folderModel');
|
||||
import { AcsUserModel } from '../models/ACS/acsUserModel';
|
||||
import { FolderModel } from '../models/ACS/folderModel';
|
||||
|
||||
import TestConfig = require('../test.config');
|
||||
import Util = require('../util/util');
|
||||
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { UploadActions } from '../actions/ACS/upload.actions';
|
||||
|
||||
@@ -20,8 +20,8 @@ import { LoginPage } from '../pages/adf/loginPage';
|
||||
import { UserInfoDialog } from '../pages/adf/dialog/userInfoDialog';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
|
||||
import AcsUserModel = require('../models/ACS/acsUserModel');
|
||||
import FileModel = require('../models/ACS/fileModel');
|
||||
import { AcsUserModel } from '../models/ACS/acsUserModel';
|
||||
import { FileModel } from '../models/ACS/fileModel';
|
||||
|
||||
import PeopleAPI = require('../restAPI/ACS/PeopleAPI');
|
||||
|
||||
|
||||
@@ -21,16 +21,16 @@ import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import { ViewerPage } from '../../pages/adf/viewerPage';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
|
||||
import ContentListPage = require('../../pages/adf/dialog/contentList');
|
||||
import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
|
||||
import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
|
||||
|
||||
import resources = require('../../util/resources');
|
||||
import Util = require('../../util/util');
|
||||
import { Util } from '../../util/util';
|
||||
import CONSTANTS = require('../../util/constants');
|
||||
|
||||
import FileModel = require('../../models/ACS/fileModel');
|
||||
import FolderModel = require('../../models/ACS/folderModel');
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import { FileModel } from '../../models/ACS/fileModel';
|
||||
import { FolderModel } from '../../models/ACS/folderModel';
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { UploadActions } from '../../actions/ACS/upload.actions';
|
||||
|
||||
@@ -25,8 +25,8 @@ import { ViewerPage } from '../../pages/adf/viewerPage';
|
||||
|
||||
import resources = require('../../util/resources');
|
||||
|
||||
import FileModel = require('../../models/ACS/fileModel');
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import { FileModel } from '../../models/ACS/fileModel';
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { UploadActions } from '../../actions/ACS/upload.actions';
|
||||
|
||||
@@ -23,8 +23,8 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
|
||||
|
||||
import resources = require('../../util/resources');
|
||||
|
||||
import FileModel = require('../../models/ACS/fileModel');
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import { FileModel } from '../../models/ACS/fileModel';
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { UploadActions } from '../../actions/ACS/upload.actions';
|
||||
|
||||
@@ -21,12 +21,12 @@ import { LoginPage } from '../../pages/adf/loginPage';
|
||||
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
|
||||
import { ViewerPage } from '../../pages/adf/viewerPage';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
import DataTablePage = require('../../pages/adf/dataTablePage');
|
||||
import { DataTablePage } from '../../pages/adf/dataTablePage';
|
||||
|
||||
import resources = require('../../util/resources');
|
||||
|
||||
import FileModel = require('../../models/ACS/fileModel');
|
||||
import AcsUserModel = require('../../models/ACS/acsUserModel');
|
||||
import { FileModel } from '../../models/ACS/fileModel';
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
|
||||
import AlfrescoApi = require('alfresco-js-api-node');
|
||||
import { UploadActions } from '../../actions/ACS/upload.actions';
|
||||
|
||||
Reference in New Issue
Block a user