[ACA-3996] Libraries list is not re-ordered in ACA as it is in ADW (#1721)

* reorder libraries sections

* update e2e

* e2e update

* e2e update
This commit is contained in:
Cilibiu Bogdan 2020-10-07 18:40:48 +03:00 committed by GitHub
parent d7367623f6
commit ffa7ca3aa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 18 deletions

View File

@ -43,7 +43,7 @@ export function collaboratorTests(siteName?: string) {
}); });
it('on File Libraries - [C297647]', async () => { it('on File Libraries - [C297647]', async () => {
await page.clickFileLibrariesAndWait(); await page.goToMyLibrariesAndWait();
await dataTable.doubleClickOnRowByName(siteName); await dataTable.doubleClickOnRowByName(siteName);
await dataTable.waitForHeader(); await dataTable.waitForHeader();
@ -85,7 +85,7 @@ export function collaboratorTests(siteName?: string) {
describe('available actions in the viewer : ', () => { describe('available actions in the viewer : ', () => {
it('file opened from File Libraries - [C297654]', async () => { it('file opened from File Libraries - [C297654]', async () => {
await page.clickFileLibrariesAndWait(); await page.goToMyLibrariesAndWait();
await dataTable.doubleClickOnRowByName(siteName); await dataTable.doubleClickOnRowByName(siteName);
await dataTable.waitForHeader(); await dataTable.waitForHeader();
@ -170,7 +170,7 @@ export function filesLockedByCurrentUser(siteName?: string) {
}); });
it('on File Libraries - [C297657]', async () => { it('on File Libraries - [C297657]', async () => {
await page.clickFileLibrariesAndWait(); await page.goToMyLibrariesAndWait();
await dataTable.doubleClickOnRowByName(siteName); await dataTable.doubleClickOnRowByName(siteName);
await dataTable.waitForHeader(); await dataTable.waitForHeader();
@ -212,7 +212,7 @@ export function filesLockedByCurrentUser(siteName?: string) {
describe('available actions in the viewer : ', () => { describe('available actions in the viewer : ', () => {
it('file opened from File Libraries - [C297661]', async () => { it('file opened from File Libraries - [C297661]', async () => {
await page.clickFileLibrariesAndWait(); await page.goToMyLibrariesAndWait();
await dataTable.doubleClickOnRowByName(siteName); await dataTable.doubleClickOnRowByName(siteName);
await dataTable.waitForHeader(); await dataTable.waitForHeader();

View File

@ -230,7 +230,7 @@ describe('Library properties', () => {
it('[C289337] Info drawer button is not displayed when user is not the library manager', async () => { it('[C289337] Info drawer button is not displayed when user is not the library manager', async () => {
await loginPage.loginWith(user2); await loginPage.loginWith(user2);
await page.clickFileLibrariesAndWait(); await page.goToMyLibrariesAndWait();
await dataTable.selectItem(site.name); await dataTable.selectItem(site.name);
expect(await page.toolbar.isButtonPresent('View Details')).toBe(false, 'View Details is present'); expect(await page.toolbar.isButtonPresent('View Details')).toBe(false, 'View Details is present');
}); });
@ -238,7 +238,7 @@ describe('Library properties', () => {
it('[C289344] Error notification', async () => { it('[C289344] Error notification', async () => {
await loginPage.loginWith(user3); await loginPage.loginWith(user3);
await page.clickFileLibrariesAndWait(); await page.goToMyLibrariesAndWait();
await dataTable.selectItem(site.name); await dataTable.selectItem(site.name);
await page.toolbar.viewDetailsButton.click(); await page.toolbar.viewDetailsButton.click();
await infoDrawer.waitForInfoDrawerToOpen(); await infoDrawer.waitForInfoDrawerToOpen();

View File

@ -138,7 +138,7 @@ describe('Breadcrumb', () => {
await page.dataTable.doubleClickOnRowByName(parent); await page.dataTable.doubleClickOnRowByName(parent);
await page.dataTable.doubleClickOnRowByName(subFolder1); await page.dataTable.doubleClickOnRowByName(subFolder1);
await page.dataTable.doubleClickOnRowByName(subFolder2); await page.dataTable.doubleClickOnRowByName(subFolder2);
const expectedItems = ['My Libraries', siteName, parent, subFolder1, subFolder2]; const expectedItems = ['Favorite Libraries', siteName, parent, subFolder1, subFolder2];
expect(await breadcrumb.getAllItems()).toEqual(expectedItems); expect(await breadcrumb.getAllItems()).toEqual(expectedItems);
}); });

View File

@ -56,11 +56,11 @@ describe('Sidebar', () => {
expect(await sidenav.getLink(SIDEBAR_LABELS.FAVORITE_LIBRARIES).isPresent()).toBe(true, 'Favorite Libraries link not present'); expect(await sidenav.getLink(SIDEBAR_LABELS.FAVORITE_LIBRARIES).isPresent()).toBe(true, 'Favorite Libraries link not present');
}); });
it('[C289900] My Libraries is automatically selected on expanding File Libraries', async () => { it('[C289900] Favorite Libraries is automatically selected on expanding File Libraries', async () => {
await sidenav.expandFileLibraries(); await sidenav.expandFileLibraries();
expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.MY_LIBRARIES); expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.FAVORITE_LIBRARIES);
expect(await sidenav.isActive(SIDEBAR_LABELS.FILE_LIBRARIES)).toBe(true, 'File Libraries is not active'); expect(await sidenav.isActive(SIDEBAR_LABELS.FILE_LIBRARIES)).toBe(true, 'File Libraries is not active');
expect(await sidenav.isActive(SIDEBAR_LABELS.MY_LIBRARIES)).toBe(true, 'My Libraries link not active'); expect(await sidenav.isActive(SIDEBAR_LABELS.FAVORITE_LIBRARIES)).toBe(true, 'Favorite Libraries link not active');
}); });
it('[C289902] navigate to Favorite Libraries', async () => { it('[C289902] navigate to Favorite Libraries', async () => {

View File

@ -184,19 +184,19 @@
"title": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.LABEL", "title": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.TOOLTIP", "description": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.TOOLTIP",
"children": [ "children": [
{
"id": "app.navbar.libraries.files",
"order": 100,
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
},
{ {
"id": "app.navbar.libraries.favorite", "id": "app.navbar.libraries.favorite",
"order": 200, "order": 100,
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL", "title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP", "description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries" "route": "favorite/libraries"
},
{
"id": "app.navbar.libraries.files",
"order": 200,
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
} }
] ]
} }