mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2026-09-09 18:03:21 +00:00
[ACS-259] refactor login page (#5733)
* refator login page * refator login page * remove obsolete classes and move what is needed in the test pck * fix const * revert modify * remove duplicate browser property * fix build * fix * fix * fix lint * move drop action in testing remove not necessary space js-api centralize content * first refactor use js-api * fix protractor * refactor test config * simplify properties fix namings * ps cloud simplify remove unused js files * id fix * fix search test simplify environment var step 1 * fix lint * first user iteration fix * fix model * unify use of apiService * first step automatic user creation Identity * refactor creation user content-services * refactor creation user search * refactor creation user core * process service refactoring 1 * process service refactoring 1 * process service refactoring 2 * fix process * appconfig * fix process util * fix gallery * fix "this" reference issues * fix incorrect import paths * fix core * some fixes * allign * fix some test remove structure folder and move in actions * fixes * move folders in the right place * fix * fix rebase * solve build issue * fix e2e * change init aae * order api and some fixes * fix possible not valid password * fix some ps test * replace host port also in objects * Update app-config.service.ts * fix process * fix process test * process service cloud fix * fiexs * modify init script * fix two test * remove unused property * host issue * not use npx * fix ps cloud test Co-authored-by: Denys Vuika <denys.vuika@gmail.com>
This commit is contained in:
Eugenio Romano
co-authored by
Denys Vuika
Denys Vuika
parent
f0df6b3a5f
commit
a78f24ada1
@@ -15,30 +15,36 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { LoginPage, BrowserActions, UploadActions, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing';
|
||||
import {
|
||||
LoginSSOPage,
|
||||
BrowserActions,
|
||||
UploadActions,
|
||||
StringUtil,
|
||||
LocalStorageUtil,
|
||||
ApiService,
|
||||
UserModel
|
||||
} from '@alfresco/adf-testing';
|
||||
import { SearchResultsPage } from '../../pages/adf/search-results.page';
|
||||
import { SearchFiltersPage } from '../../pages/adf/search-filters.page';
|
||||
import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
|
||||
import { AcsUserModel } from '../../models/ACS/acs-user.model';
|
||||
import { SearchConfiguration } from '../search.config';
|
||||
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
|
||||
import { browser } from 'protractor';
|
||||
import { UsersActions } from '../../actions/users.actions';
|
||||
|
||||
describe('Search Checklist Component', () => {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const loginPage = new LoginSSOPage();
|
||||
const searchFiltersPage = new SearchFiltersPage();
|
||||
const searchDialog = new SearchDialogPage();
|
||||
const searchResults = new SearchResultsPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
|
||||
const acsUser = new AcsUserModel();
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
provider: 'ECM',
|
||||
hostEcm: browser.params.testConfig.adf_acs.host
|
||||
});
|
||||
const uploadActions = new UploadActions(this.alfrescoJsApi);
|
||||
const acsUser = new UserModel();
|
||||
const apiService = new ApiService();
|
||||
|
||||
const uploadActions = new UploadActions(apiService);
|
||||
const usersActions = new UsersActions(apiService);
|
||||
|
||||
const filterType = {
|
||||
folder: 'Folder',
|
||||
@@ -55,19 +61,25 @@ describe('Search Checklist Component', () => {
|
||||
let createdFile, createdFolder;
|
||||
|
||||
beforeAll(async () => {
|
||||
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
|
||||
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
|
||||
await usersActions.createUser(acsUser);
|
||||
|
||||
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
|
||||
await apiService.getInstance().login(acsUser.email, acsUser.password);
|
||||
|
||||
createdFolder = await this.alfrescoJsApi.nodes.addNode('-my-', { name: nodeNames.folder, nodeType: 'cm:folder' });
|
||||
createdFile = await this.alfrescoJsApi.nodes.addNode('-my-', { name: nodeNames.document, nodeType: 'cm:content' });
|
||||
createdFolder = await apiService.getInstance().nodes.addNode('-my-', {
|
||||
name: nodeNames.folder,
|
||||
nodeType: 'cm:folder'
|
||||
});
|
||||
createdFile = await apiService.getInstance().nodes.addNode('-my-', {
|
||||
name: nodeNames.document,
|
||||
nodeType: 'cm:content'
|
||||
});
|
||||
|
||||
await browser.sleep(15000);
|
||||
|
||||
await loginPage.loginToContentServicesUsingUserModel(acsUser);
|
||||
});
|
||||
await loginPage.login(acsUser.email, acsUser.password);
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
await navigationBarPage.clickContentServicesButton();
|
||||
@@ -75,15 +87,15 @@ describe('Search Checklist Component', () => {
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
|
||||
await uploadActions.deleteFileOrFolder(createdFile.entry.id);
|
||||
await uploadActions.deleteFileOrFolder(createdFolder.entry.id);
|
||||
|
||||
await navigationBarPage.clickLogoutButton();
|
||||
});
|
||||
});
|
||||
|
||||
it('[C276991] Should be able to click between options and Clear All button', async() => {
|
||||
it('[C276991] Should be able to click between options and Clear All button', async () => {
|
||||
await searchFiltersPage.checkCheckListFilterIsDisplayed();
|
||||
await searchFiltersPage.checkCheckListFilterIsCollapsed();
|
||||
await searchFiltersPage.clickCheckListFilter();
|
||||
@@ -271,10 +283,9 @@ describe('Search Checklist Component', () => {
|
||||
await searchFiltersPage.checkListFiltersPage().checkShowMoreButtonIsNotDisplayed();
|
||||
await searchFiltersPage.checkListFiltersPage().checkShowLessButtonIsDisplayed();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('Properties', () => {
|
||||
|
||||
let jsonFile;
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -282,7 +293,7 @@ describe('Search Checklist Component', () => {
|
||||
});
|
||||
|
||||
beforeAll(async () => {
|
||||
await loginPage.loginToContentServicesUsingUserModel(acsUser);
|
||||
await loginPage.login(acsUser.email, acsUser.password);
|
||||
});
|
||||
|
||||
it('[C277018] Should be able to change the operator', async () => {
|
||||
|
||||
@@ -15,8 +15,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { DataTableComponentPage, DatePickerCalendarPage, DateUtil, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing';
|
||||
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
|
||||
import { DataTableComponentPage, DatePickerCalendarPage, DateUtil, LocalStorageUtil, LoginSSOPage } from '@alfresco/adf-testing';
|
||||
import { browser } from 'protractor';
|
||||
import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
|
||||
@@ -26,7 +25,7 @@ import { SearchConfiguration } from '../search.config';
|
||||
|
||||
describe('Search Date Range Filter', () => {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const loginPage = new LoginSSOPage();
|
||||
const searchDialog = new SearchDialogPage();
|
||||
const searchFilters = new SearchFiltersPage();
|
||||
const dateRangeFilter = searchFilters.createdDateRangeFilterPage();
|
||||
@@ -36,13 +35,7 @@ describe('Search Date Range Filter', () => {
|
||||
const dataTable = new DataTableComponentPage();
|
||||
|
||||
beforeAll(async () => {
|
||||
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
provider: 'ECM',
|
||||
hostEcm: browser.params.testConfig.adf_acs.host
|
||||
});
|
||||
|
||||
await loginPage.loginToContentServices(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
|
||||
await searchDialog.checkSearchIconIsVisible();
|
||||
await searchDialog.clickOnSearchIcon();
|
||||
@@ -130,12 +123,11 @@ describe('Search Date Range Filter', () => {
|
||||
|
||||
const results: any = dataTable.geCellElementDetail('Created');
|
||||
for (const currentResult of results) {
|
||||
const currentDate = currentResult.getAttribute('title');
|
||||
const currentDateFormatted = DateUtil.parse(currentDate, 'MMM DD, YYYY, h:mm:ss a');
|
||||
|
||||
const currentDate = currentResult.getAttribute('title');
|
||||
const currentDateFormatted = DateUtil.parse(currentDate, 'MMM DD, YYYY, h:mm:ss a');
|
||||
|
||||
await expect(currentDateFormatted <= DateUtil.parse(toDate, 'DD-MM-YY')).toBe(true);
|
||||
await expect(currentDateFormatted >= DateUtil.parse(fromDate, 'DD-MM-YY')).toBe(true);
|
||||
await expect(currentDateFormatted <= DateUtil.parse(toDate, 'DD-MM-YY')).toBe(true);
|
||||
await expect(currentDateFormatted >= DateUtil.parse(fromDate, 'DD-MM-YY')).toBe(true);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -176,7 +168,6 @@ describe('Search Date Range Filter', () => {
|
||||
});
|
||||
|
||||
describe('configuration change', () => {
|
||||
|
||||
let jsonFile;
|
||||
|
||||
beforeAll(async () => {
|
||||
|
||||
@@ -15,20 +15,27 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { LoginPage, LocalStorageUtil, UploadActions, DataTableComponentPage, DateUtil } from '@alfresco/adf-testing';
|
||||
import {
|
||||
LoginSSOPage,
|
||||
LocalStorageUtil,
|
||||
UploadActions,
|
||||
DataTableComponentPage,
|
||||
DateUtil,
|
||||
ApiService,
|
||||
UserModel
|
||||
} from '@alfresco/adf-testing';
|
||||
import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page';
|
||||
import { SearchResultsPage } from '../../pages/adf/search-results.page';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
|
||||
import { SearchFiltersPage } from '../../pages/adf/search-filters.page';
|
||||
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
|
||||
import { AcsUserModel } from '../../models/ACS/acs-user.model';
|
||||
import { FileModel } from '../../models/ACS/file.model';
|
||||
import { browser } from 'protractor';
|
||||
import { SearchConfiguration } from '../search.config';
|
||||
import { UsersActions } from '../../actions/users.actions';
|
||||
|
||||
describe('Search Number Range Filter', () => {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const loginPage = new LoginSSOPage();
|
||||
const searchDialog = new SearchDialogPage();
|
||||
const searchFilters = new SearchFiltersPage();
|
||||
const sizeRangeFilter = searchFilters.sizeRangeFilterPage();
|
||||
@@ -36,7 +43,7 @@ describe('Search Number Range Filter', () => {
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const dataTable = new DataTableComponentPage();
|
||||
|
||||
const acsUser = new AcsUserModel();
|
||||
const acsUser = new UserModel();
|
||||
|
||||
const file2BytesModel = new FileModel({
|
||||
'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name,
|
||||
@@ -49,25 +56,23 @@ describe('Search Number Range Filter', () => {
|
||||
});
|
||||
|
||||
let file2Bytes, file0Bytes;
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
provider: 'ECM',
|
||||
hostEcm: browser.params.testConfig.adf_acs.host
|
||||
});
|
||||
const uploadActions = new UploadActions(this.alfrescoJsApi);
|
||||
const apiService = new ApiService();
|
||||
const usersActions = new UsersActions(apiService);
|
||||
|
||||
const uploadActions = new UploadActions(apiService);
|
||||
|
||||
beforeAll(async () => {
|
||||
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
|
||||
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await usersActions.createUser(acsUser);
|
||||
|
||||
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
|
||||
|
||||
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
|
||||
await apiService.getInstance().login(acsUser.email, acsUser.password);
|
||||
|
||||
file2Bytes = await uploadActions.uploadFile(file2BytesModel.location, file2BytesModel.name, '-my-');
|
||||
file0Bytes = await uploadActions.uploadFile(file0BytesModel.location, file0BytesModel.name, '-my-');
|
||||
await browser.sleep(15000);
|
||||
|
||||
await loginPage.loginToContentServices(acsUser.id, acsUser.password);
|
||||
await loginPage.login(acsUser.email, acsUser.password);
|
||||
|
||||
await searchDialog.checkSearchIconIsVisible();
|
||||
await searchDialog.clickOnSearchIcon();
|
||||
@@ -75,7 +80,7 @@ describe('Search Number Range Filter', () => {
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
|
||||
await apiService.getInstance().login(acsUser.email, acsUser.password);
|
||||
await uploadActions.deleteFileOrFolder(file2Bytes.entry.id);
|
||||
await uploadActions.deleteFileOrFolder(file0Bytes.entry.id);
|
||||
|
||||
@@ -418,8 +423,7 @@ describe('Search Number Range Filter', () => {
|
||||
await expect(currentDateFormatted.getFullYear() <= toYear).toBe(true);
|
||||
await expect(currentDateFormatted.getFullYear() >= fromYear).toBe(true);
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
it('[C277139] Should be able to set To field to be exclusive', async () => {
|
||||
await navigationBarPage.clickContentServicesButton();
|
||||
|
||||
@@ -15,30 +15,36 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { LoginPage, BrowserActions, StringUtil, LocalStorageUtil, UploadActions } from '@alfresco/adf-testing';
|
||||
import {
|
||||
LoginSSOPage,
|
||||
BrowserActions,
|
||||
StringUtil,
|
||||
LocalStorageUtil,
|
||||
UploadActions,
|
||||
ApiService,
|
||||
UserModel
|
||||
} from '@alfresco/adf-testing';
|
||||
import { SearchFiltersPage } from '../../pages/adf/search-filters.page';
|
||||
import { SearchResultsPage } from '../../pages/adf/search-results.page';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
|
||||
import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page';
|
||||
import { AcsUserModel } from '../../models/ACS/acs-user.model';
|
||||
import { SearchConfiguration } from '../search.config';
|
||||
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
|
||||
import { browser } from 'protractor';
|
||||
import { UsersActions } from '../../actions/users.actions';
|
||||
|
||||
describe('Search Radio Component', () => {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const loginPage = new LoginSSOPage();
|
||||
const searchFiltersPage = new SearchFiltersPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const searchDialog = new SearchDialogPage();
|
||||
const searchResults = new SearchResultsPage();
|
||||
|
||||
const acsUser = new AcsUserModel();
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
provider: 'ECM',
|
||||
hostEcm: browser.params.testConfig.adf_acs.host
|
||||
});
|
||||
const uploadActions = new UploadActions(this.alfrescoJsApi);
|
||||
const acsUser = new UserModel();
|
||||
const apiService = new ApiService();
|
||||
|
||||
const uploadActions = new UploadActions(apiService);
|
||||
const usersActions = new UsersActions(apiService);
|
||||
|
||||
const filterType = {
|
||||
none: 'None',
|
||||
@@ -57,29 +63,29 @@ describe('Search Radio Component', () => {
|
||||
let createdFile, createdFolder;
|
||||
|
||||
beforeAll(async () => {
|
||||
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
|
||||
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
|
||||
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
|
||||
await usersActions.createUser(acsUser);
|
||||
await apiService.getInstance().login(acsUser.email, acsUser.password);
|
||||
|
||||
createdFolder = await this.alfrescoJsApi.nodes.addNode('-my-', {
|
||||
createdFolder = await apiService.getInstance().nodes.addNode('-my-', {
|
||||
name: nodeNames.folder,
|
||||
nodeType: 'cm:folder'
|
||||
});
|
||||
createdFile = await this.alfrescoJsApi.nodes.addNode('-my-', {
|
||||
createdFile = await apiService.getInstance().nodes.addNode('-my-', {
|
||||
name: nodeNames.document,
|
||||
nodeType: 'cm:content'
|
||||
});
|
||||
|
||||
await browser.sleep(15000);
|
||||
|
||||
await loginPage.loginToContentServicesUsingUserModel(acsUser);
|
||||
await loginPage.login(acsUser.email, acsUser.password);
|
||||
|
||||
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=' + randomName);
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
|
||||
await uploadActions.deleteFileOrFolder(createdFile.entry.id);
|
||||
await uploadActions.deleteFileOrFolder(createdFolder.entry.id);
|
||||
@@ -122,7 +128,6 @@ describe('Search Radio Component', () => {
|
||||
});
|
||||
|
||||
describe('configuration change', () => {
|
||||
|
||||
let jsonFile;
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -251,7 +256,6 @@ describe('Search Radio Component', () => {
|
||||
});
|
||||
|
||||
describe('Properties', () => {
|
||||
|
||||
let jsonFile;
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -259,7 +263,7 @@ describe('Search Radio Component', () => {
|
||||
});
|
||||
|
||||
beforeAll(async () => {
|
||||
await loginPage.loginToContentServicesUsingUserModel(acsUser);
|
||||
await loginPage.login(acsUser.email, acsUser.password);
|
||||
});
|
||||
|
||||
it('[C277033] Should be able to add a new option', async () => {
|
||||
|
||||
@@ -15,20 +15,26 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { LoginPage, LocalStorageUtil, UploadActions, DataTableComponentPage } from '@alfresco/adf-testing';
|
||||
import {
|
||||
LoginSSOPage,
|
||||
LocalStorageUtil,
|
||||
UploadActions,
|
||||
DataTableComponentPage,
|
||||
ApiService,
|
||||
UserModel
|
||||
} from '@alfresco/adf-testing';
|
||||
import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page';
|
||||
import { SearchResultsPage } from '../../pages/adf/search-results.page';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
|
||||
import { SearchFiltersPage } from '../../pages/adf/search-filters.page';
|
||||
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
|
||||
import { AcsUserModel } from '../../models/ACS/acs-user.model';
|
||||
import { FileModel } from '../../models/ACS/file.model';
|
||||
import { browser } from 'protractor';
|
||||
import { SearchConfiguration } from '../search.config';
|
||||
import { UsersActions } from '../../actions/users.actions';
|
||||
|
||||
describe('Search Slider Filter', () => {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const loginPage = new LoginSSOPage();
|
||||
const searchDialog = new SearchDialogPage();
|
||||
const searchFilters = new SearchFiltersPage();
|
||||
const sizeSliderFilter = searchFilters.sizeSliderFilterPage();
|
||||
@@ -36,7 +42,7 @@ describe('Search Slider Filter', () => {
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const dataTable = new DataTableComponentPage();
|
||||
|
||||
const acsUser = new AcsUserModel();
|
||||
const acsUser = new UserModel();
|
||||
|
||||
const file2BytesModel = new FileModel({
|
||||
'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name,
|
||||
@@ -44,24 +50,22 @@ describe('Search Slider Filter', () => {
|
||||
});
|
||||
|
||||
let file2Bytes;
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
provider: 'ECM',
|
||||
hostEcm: browser.params.testConfig.adf_acs.host
|
||||
});
|
||||
const uploadActions = new UploadActions(this.alfrescoJsApi);
|
||||
const apiService = new ApiService();
|
||||
|
||||
const uploadActions = new UploadActions(apiService);
|
||||
const usersActions = new UsersActions(apiService);
|
||||
|
||||
beforeAll(async () => {
|
||||
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
|
||||
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await usersActions.createUser(acsUser);
|
||||
|
||||
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
|
||||
|
||||
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
|
||||
await apiService.getInstance().login(acsUser.email, acsUser.password);
|
||||
|
||||
file2Bytes = await uploadActions.uploadFile(file2BytesModel.location, file2BytesModel.name, '-my-');
|
||||
await browser.sleep(15000);
|
||||
|
||||
await loginPage.loginToContentServices(acsUser.id, acsUser.password);
|
||||
await loginPage.login(acsUser.email, acsUser.password);
|
||||
|
||||
await searchDialog.checkSearchIconIsVisible();
|
||||
await searchDialog.clickOnSearchIcon();
|
||||
@@ -70,7 +74,7 @@ describe('Search Slider Filter', () => {
|
||||
|
||||
afterAll(async () => {
|
||||
try {
|
||||
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
|
||||
await apiService.getInstance().login(acsUser.email, acsUser.password);
|
||||
await uploadActions.deleteFileOrFolder(file2Bytes.entry.id);
|
||||
} catch (error) {
|
||||
}
|
||||
|
||||
@@ -16,33 +16,32 @@
|
||||
*/
|
||||
|
||||
import {
|
||||
LoginPage,
|
||||
LoginSSOPage,
|
||||
LocalStorageUtil,
|
||||
SearchSortingPickerPage,
|
||||
UploadActions
|
||||
UploadActions,
|
||||
ApiService,
|
||||
UserModel
|
||||
} from '@alfresco/adf-testing';
|
||||
import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page';
|
||||
import { SearchResultsPage } from '../../pages/adf/search-results.page';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
|
||||
import { SearchFiltersPage } from '../../pages/adf/search-filters.page';
|
||||
import { ContentServicesPage } from '../../pages/adf/content-services.page';
|
||||
import { NodeActions } from '../../actions/ACS/node.actions';
|
||||
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
|
||||
import { AcsUserModel } from '../../models/ACS/acs-user.model';
|
||||
import { browser } from 'protractor';
|
||||
import { SearchConfiguration } from '../search.config';
|
||||
import { UsersActions } from '../../actions/users.actions';
|
||||
|
||||
describe('Search Sorting Picker', () => {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const loginPage = new LoginSSOPage();
|
||||
const searchDialog = new SearchDialogPage();
|
||||
const searchFilters = new SearchFiltersPage();
|
||||
const searchResults = new SearchResultsPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const searchSortingPicker = new SearchSortingPickerPage();
|
||||
const contentServices = new ContentServicesPage();
|
||||
const nodeActions = new NodeActions();
|
||||
const acsUser = new AcsUserModel();
|
||||
const acsUser = new UserModel();
|
||||
|
||||
const pngAModel = {
|
||||
'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
|
||||
@@ -55,33 +54,33 @@ describe('Search Sorting Picker', () => {
|
||||
};
|
||||
|
||||
let pngA, pngD;
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
provider: 'ECM',
|
||||
hostEcm: browser.params.testConfig.adf_acs.host
|
||||
});
|
||||
const uploadActions = new UploadActions(this.alfrescoJsApi);
|
||||
const apiService = new ApiService();
|
||||
|
||||
const uploadActions = new UploadActions(apiService);
|
||||
const usersActions = new UsersActions(apiService);
|
||||
|
||||
const search = '_png_file.png';
|
||||
let jsonFile;
|
||||
|
||||
beforeAll(async () => {
|
||||
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
|
||||
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
await usersActions.createUser(acsUser);
|
||||
|
||||
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
|
||||
await apiService.getInstance().login(acsUser.email, acsUser.password);
|
||||
|
||||
pngA = await uploadActions.uploadFile(pngAModel.location, pngAModel.name, '-my-');
|
||||
pngD = await uploadActions.uploadFile(pngDModel.location, pngDModel.name, '-my-');
|
||||
await browser.sleep(12000);
|
||||
|
||||
await loginPage.loginToContentServices(acsUser.id, acsUser.password);
|
||||
});
|
||||
await loginPage.login(acsUser.email, acsUser.password);
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await uploadActions.deleteFileOrFolder(pngA.entry.id);
|
||||
await uploadActions.deleteFileOrFolder(pngD.entry.id);
|
||||
|
||||
await navigationBarPage.clickLogoutButton();
|
||||
});
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
await searchDialog.clickOnSearchIcon();
|
||||
@@ -214,11 +213,26 @@ describe('Search Sorting Picker', () => {
|
||||
const idList = await contentServices.getElementsDisplayedId();
|
||||
const numberOfElements = await contentServices.numberOfResultsDisplayed();
|
||||
|
||||
const nodeList = await nodeActions.getNodesDisplayed(this.alfrescoJsApi, idList, numberOfElements);
|
||||
const nodeList = await getNodesDisplayed(numberOfElements, idList);
|
||||
|
||||
const modifiedDateList = [];
|
||||
for (let i = 0; i < nodeList.length; i++) {
|
||||
modifiedDateList.push(new Date(nodeList[i].entry.modifiedAt));
|
||||
}
|
||||
|
||||
await expect(contentServices.checkElementsDateSortedAsc(modifiedDateList)).toBe(true);
|
||||
});
|
||||
|
||||
const getNodesDisplayed = async function (numberOfElements: number, idList: string[]) {
|
||||
const promises = [];
|
||||
let nodeList;
|
||||
|
||||
for (let i = 0; i < (numberOfElements - 1); i++) {
|
||||
if (idList[i] && idList[i].trim() !== '') {
|
||||
promises.push(apiService.getInstance().core.nodesApi.getNode(idList[i]));
|
||||
}
|
||||
}
|
||||
nodeList = await Promise.all(promises);
|
||||
return nodeList;
|
||||
};
|
||||
});
|
||||
|
||||
@@ -17,57 +17,52 @@
|
||||
|
||||
import { browser } from 'protractor';
|
||||
|
||||
import { AcsUserModel } from '../../models/ACS/acs-user.model';
|
||||
import { FolderModel } from '../../models/ACS/folder.model';
|
||||
|
||||
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
|
||||
|
||||
import { LoginPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing';
|
||||
import { LoginSSOPage, LocalStorageUtil, BrowserActions, ApiService, UserModel } from '@alfresco/adf-testing';
|
||||
import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page';
|
||||
import { SearchResultsPage } from '../../pages/adf/search-results.page';
|
||||
import { SearchFiltersPage } from '../../pages/adf/search-filters.page';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigation-bar.page';
|
||||
|
||||
import { SearchConfiguration } from '../search.config';
|
||||
import { UsersActions } from '../../actions/users.actions';
|
||||
|
||||
describe('Search component - Text widget', () => {
|
||||
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const searchFiltersPage = new SearchFiltersPage();
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
const loginPage = new LoginSSOPage();
|
||||
const searchDialog = new SearchDialogPage();
|
||||
const searchResultPage = new SearchResultsPage();
|
||||
|
||||
const acsUser = new AcsUserModel();
|
||||
const newFolderModel = new FolderModel({ 'name': 'newFolder', 'description': 'newDescription' });
|
||||
const apiService = new ApiService();
|
||||
const usersActions = new UsersActions(apiService);
|
||||
|
||||
const acsUser = new UserModel();
|
||||
const newFolderModel = new FolderModel({ 'description': 'newDescription' });
|
||||
|
||||
beforeAll(async () => {
|
||||
await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
|
||||
|
||||
this.alfrescoJsApi = new AlfrescoApi({
|
||||
provider: 'ECM',
|
||||
hostEcm: browser.params.testConfig.adf_acs.host
|
||||
});
|
||||
await usersActions.createUser(acsUser);
|
||||
|
||||
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
|
||||
await apiService.getInstance().login(acsUser.email, acsUser.password);
|
||||
|
||||
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
|
||||
|
||||
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
|
||||
|
||||
await this.alfrescoJsApi.nodes.addNode('-my-', {
|
||||
await apiService.getInstance().nodes.addNode('-my-', {
|
||||
'name': newFolderModel.name,
|
||||
'nodeType': 'cm:folder',
|
||||
'properties':
|
||||
{
|
||||
'cm:description': newFolderModel.description
|
||||
}
|
||||
}, {}, {});
|
||||
}, {});
|
||||
|
||||
await browser.sleep(15000);
|
||||
|
||||
await loginPage.loginToContentServicesUsingUserModel(acsUser);
|
||||
});
|
||||
await loginPage.login(acsUser.email, acsUser.password);
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await navigationBarPage.clickLogoutButton();
|
||||
@@ -82,7 +77,6 @@ describe('Search component - Text widget', () => {
|
||||
});
|
||||
|
||||
describe('configuration change', () => {
|
||||
|
||||
let jsonFile;
|
||||
|
||||
beforeAll(async () => {
|
||||
|
||||
Reference in New Issue
Block a user