From 946e3e21966abd88e653c9fc4d1f31403685046f Mon Sep 17 00:00:00 2001
From: Adina Parpalita <adina.parpalita@ness.com>
Date: Fri, 2 Nov 2018 12:37:07 +0200
Subject: [PATCH] [ACA] e2e remove not needed logoutPage (#772)
* remove not needed logoutPage
* disable back failing check
* fix failing test
---
.../dialog/create-edit-folder-dialog.ts | 4 ++
e2e/pages/logout-page.ts | 42 -------------------
e2e/pages/pages.ts | 1 -
.../context-menu-multiple-selection.test.ts | 4 +-
.../context-menu-single-selection.test.ts | 4 +-
e2e/suites/actions/create-folder.test.ts | 9 ++--
e2e/suites/actions/delete-undo-delete.test.ts | 7 +---
e2e/suites/actions/edit-folder.test.ts | 10 ++---
e2e/suites/actions/mark-favorite.test.ts | 6 +--
e2e/suites/actions/permanently-delete.test.ts | 8 +---
e2e/suites/actions/restore.test.ts | 13 ++----
e2e/suites/actions/share-file.test.ts | 8 +---
e2e/suites/actions/single-click.test.ts | 4 +-
...cial-permissions-available-actions.test.ts | 4 +-
.../toolbar-multiple-selection.test.ts | 6 +--
.../actions/toolbar-single-selection.test.ts | 6 +--
e2e/suites/actions/unshare-file.test.ts | 8 +---
e2e/suites/actions/upload-file.test.ts | 8 +---
e2e/suites/application/general.test.ts | 14 +++----
e2e/suites/application/page-titles.test.ts | 8 +---
e2e/suites/authentication/login.test.ts | 5 +--
e2e/suites/authentication/logout.test.ts | 8 +---
.../extensions/ext-context-submenus.test.ts | 4 +-
.../extensions/ext-document-list.test.ts | 4 +-
e2e/suites/extensions/ext-header.test.ts | 8 +---
e2e/suites/extensions/ext-info-drawer.test.ts | 13 +-----
e2e/suites/extensions/ext-metadata.test.ts | 4 +-
e2e/suites/extensions/ext-viewer.test.ts | 4 +-
.../info-drawer/library-properties.test.ts | 4 +-
e2e/suites/list-views/empty-list.test.ts | 8 +---
e2e/suites/list-views/favorites.test.ts | 4 +-
e2e/suites/list-views/file-libraries.test.ts | 4 +-
e2e/suites/list-views/generic-errors.test.ts | 6 +--
e2e/suites/list-views/permissions.test.ts | 13 ++----
e2e/suites/list-views/personal-files.test.ts | 13 +-----
e2e/suites/list-views/recent-files.test.ts | 4 +-
e2e/suites/list-views/shared-files.test.ts | 4 +-
e2e/suites/list-views/tooltips.test.ts | 6 +--
e2e/suites/list-views/trash.test.ts | 13 +-----
e2e/suites/navigation/breadcrumb.test.ts | 12 ++----
e2e/suites/navigation/sidebar.test.ts | 8 +---
e2e/suites/pagination/pag-favorites.test.ts | 4 +-
.../pagination/pag-file-libraries.test.ts | 8 +---
.../pagination/pag-personal-files.test.ts | 8 +---
.../pagination/pag-recent-files.test.ts | 8 +---
.../pagination/pag-shared-files.test.ts | 4 +-
e2e/suites/pagination/pag-single-page.test.ts | 8 ++--
e2e/suites/pagination/pag-trash.test.ts | 4 +-
e2e/suites/viewer/viewer-actions.test.ts | 8 +---
e2e/suites/viewer/viewer-general.test.ts | 4 +-
50 files changed, 81 insertions(+), 298 deletions(-)
delete mode 100755 e2e/pages/logout-page.ts
diff --git a/e2e/components/dialog/create-edit-folder-dialog.ts b/e2e/components/dialog/create-edit-folder-dialog.ts
index 1536d2e80..c07b39a49 100755
--- a/e2e/components/dialog/create-edit-folder-dialog.ts
+++ b/e2e/components/dialog/create-edit-folder-dialog.ts
@@ -60,6 +60,10 @@ export class CreateOrEditFolderDialog extends Component {
await browser.wait(EC.stalenessOf(this.title), BROWSER_WAIT_TIMEOUT);
}
+ async isDialogOpen() {
+ return await browser.isElementPresent(by.css(CreateOrEditFolderDialog.selectors.root));
+ }
+
async getTitle() {
return await this.title.getText();
}
diff --git a/e2e/pages/logout-page.ts b/e2e/pages/logout-page.ts
deleted file mode 100755
index da309446b..000000000
--- a/e2e/pages/logout-page.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
- * @license
- * Alfresco Example Content Application
- *
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { Page } from './page';
-import { APP_ROUTES } from '../configs';
-import { Utils } from '../utilities/utils';
-
-export class LogoutPage extends Page {
- /** @override */
- constructor() {
- super(APP_ROUTES.LOGIN);
- }
-
- /** @override */
- load() {
- // await Utils.clearLocalStorage();
- // await Utils.clearSessionStorage();
- return super.load();
- }
-}
diff --git a/e2e/pages/pages.ts b/e2e/pages/pages.ts
index 196228230..6ed77b16d 100755
--- a/e2e/pages/pages.ts
+++ b/e2e/pages/pages.ts
@@ -25,4 +25,3 @@
export * from './browsing-page';
export * from './login-page';
-export * from './logout-page';
diff --git a/e2e/suites/actions/context-menu-multiple-selection.test.ts b/e2e/suites/actions/context-menu-multiple-selection.test.ts
index 3c9469a47..707cb0134 100755
--- a/e2e/suites/actions/context-menu-multiple-selection.test.ts
+++ b/e2e/suites/actions/context-menu-multiple-selection.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -54,7 +54,6 @@ describe('Context menu actions - multiple selection : ', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
const contextMenu = dataTable.menu;
@@ -94,7 +93,6 @@ describe('Context menu actions - multiple selection : ', () => {
await apis.user.nodes.deleteNodesById([ file1Id, file2Id, folder1Id, folder2Id ]);
await apis.user.sites.deleteSite(siteName);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/actions/context-menu-single-selection.test.ts b/e2e/suites/actions/context-menu-single-selection.test.ts
index 02857dc6e..90a8b8a61 100755
--- a/e2e/suites/actions/context-menu-single-selection.test.ts
+++ b/e2e/suites/actions/context-menu-single-selection.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -46,7 +46,6 @@ describe('Context menu actions - single selection : ', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
const contextMenu = dataTable.menu;
@@ -83,7 +82,6 @@ describe('Context menu actions - single selection : ', () => {
await apis.user.nodes.deleteNodeById(folderUserId);
await apis.user.sites.deleteSite(siteName);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/actions/create-folder.test.ts b/e2e/suites/actions/create-folder.test.ts
index 1c26e9847..f7cd52047 100755
--- a/e2e/suites/actions/create-folder.test.ts
+++ b/e2e/suites/actions/create-folder.test.ts
@@ -24,9 +24,8 @@
*/
import { browser } from 'protractor';
-
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { CreateOrEditFolderDialog } from '../../components/dialog/create-edit-folder-dialog';
import { Menu } from '../../components/menu/menu';
import { Utils } from '../../utilities/utils';
@@ -50,7 +49,6 @@ describe('Create folder', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const createDialog = new CreateOrEditFolderDialog();
const { dataTable } = page;
@@ -71,7 +69,6 @@ describe('Create folder', () => {
afterAll(async (done) => {
await apis.admin.sites.deleteSite(siteName);
await apis.user.nodes.deleteNodeById(parentId);
- await logoutPage.load();
done();
});
@@ -201,7 +198,7 @@ describe('Create folder', () => {
await createDialog.enterName('test');
await createDialog.enterDescription('test description');
await createDialog.clickCancel();
- expect(await createDialog.component.isPresent()).not.toBe(true, 'dialog is not closed');
+ expect(await createDialog.isDialogOpen()).not.toBe(true, 'dialog is not closed');
});
it('duplicate folder name - [C216350]', async () => {
@@ -212,7 +209,7 @@ describe('Create folder', () => {
await createDialog.clickCreate();
const message = await page.getSnackBarMessage();
expect(message).toEqual(`There's already a folder with this name. Try a different name.`);
- expect(await createDialog.component.isPresent()).toBe(true, 'dialog is not present');
+ expect(await createDialog.isDialogOpen()).toBe(true, 'dialog is not present');
});
it('trim ending spaces from folder name - [C216351]', async () => {
diff --git a/e2e/suites/actions/delete-undo-delete.test.ts b/e2e/suites/actions/delete-undo-delete.test.ts
index 952d7b596..b9f66d704 100755
--- a/e2e/suites/actions/delete-undo-delete.test.ts
+++ b/e2e/suites/actions/delete-undo-delete.test.ts
@@ -24,7 +24,7 @@
*/
import { browser } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -37,7 +37,6 @@ describe('Delete and undo delete', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
@@ -91,7 +90,6 @@ describe('Delete and undo delete', () => {
afterAll(async (done) => {
await apis.user.nodes.unlockFile(file4Id);
await apis.user.nodes.unlockFile(fileLocked1Id);
- await logoutPage.load();
await apis.user.nodes.deleteNodesById([file1Id, file2Id, folder1Id, folder2Id, fileLocked1Id]);
await apis.user.search.waitForApi(username, {expect: 0});
done();
@@ -266,7 +264,6 @@ describe('Delete and undo delete', () => {
});
afterAll(async (done) => {
- await logoutPage.load();
await apis.user.nodes.deleteNodesById([sharedFile1Id, sharedFile2Id, sharedFile3Id, sharedFile4Id]);
await apis.user.search.waitForApi(username, {expect: 0});
done();
@@ -377,7 +374,6 @@ describe('Delete and undo delete', () => {
afterAll(async (done) => {
await apis.user.nodes.unlockFile(favoriteFile4Id);
await apis.user.nodes.unlockFile(favoriteFileLocked1Id);
- await logoutPage.load();
await apis.user.nodes.deleteNodesById([
favoriteFile1Id, favoriteFile2Id, favoriteFolder1Id, favoriteFolder2Id, favoriteFileLocked1Id
]);
@@ -559,7 +555,6 @@ describe('Delete and undo delete', () => {
});
afterAll(async (done) => {
- await logoutPage.load();
await apis.user.nodes.deleteNodesById([recentFile1Id, recentFile2Id, recentFile3Id, recentFile4Id]);
done();
});
diff --git a/e2e/suites/actions/edit-folder.test.ts b/e2e/suites/actions/edit-folder.test.ts
index dc89e4e42..3260c16ca 100755
--- a/e2e/suites/actions/edit-folder.test.ts
+++ b/e2e/suites/actions/edit-folder.test.ts
@@ -24,7 +24,7 @@
*/
import { protractor, browser } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { CreateOrEditFolderDialog } from '../../components/dialog/create-edit-folder-dialog';
@@ -51,7 +51,6 @@ describe('Edit folder', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const editDialog = new CreateOrEditFolderDialog();
const { dataTable } = page;
@@ -88,8 +87,7 @@ describe('Edit folder', () => {
afterAll(async (done) => {
await Promise.all([
apis.admin.sites.deleteSite(siteName),
- apis.user.nodes.deleteNodeById(parentId),
- logoutPage.load()
+ apis.user.nodes.deleteNodeById(parentId)
]);
done();
});
@@ -154,7 +152,7 @@ describe('Edit folder', () => {
await editButton.click();
await editDialog.waitForDialogToOpen();
await editDialog.clickCancel();
- expect(await editDialog.component.isPresent()).not.toBe(true, 'dialog is not closed');
+ expect(await editDialog.isDialogOpen()).not.toBe(true, 'dialog is not closed');
});
it('with duplicate folder name - [C216337]', async () => {
@@ -165,7 +163,7 @@ describe('Edit folder', () => {
await editDialog.clickUpdate();
const message = await page.getSnackBarMessage();
expect(message).toEqual(`There's already a folder with this name. Try a different name.`);
- expect(await editDialog.component.isPresent()).toBe(true, 'dialog is not present');
+ expect(await editDialog.isDialogOpen()).toBe(true, 'dialog is not present');
});
it('trim ending spaces - [C216338]', async () => {
diff --git a/e2e/suites/actions/mark-favorite.test.ts b/e2e/suites/actions/mark-favorite.test.ts
index a2eac9a29..9fc59e582 100644
--- a/e2e/suites/actions/mark-favorite.test.ts
+++ b/e2e/suites/actions/mark-favorite.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -52,7 +52,6 @@ describe('Mark items as favorites', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
@@ -90,8 +89,7 @@ describe('Mark items as favorites', () => {
afterAll(async (done) => {
await Promise.all([
apis.user.nodes.deleteNodesById([ file1Id, file2Id, file3Id, file4Id, folder1Id]),
- apis.user.sites.deleteSite(siteName),
- logoutPage.load()
+ apis.user.sites.deleteSite(siteName)
]);
done();
});
diff --git a/e2e/suites/actions/permanently-delete.test.ts b/e2e/suites/actions/permanently-delete.test.ts
index e1e4796fa..0af57a469 100755
--- a/e2e/suites/actions/permanently-delete.test.ts
+++ b/e2e/suites/actions/permanently-delete.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { ConfirmDialog } from './../../components/components';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -46,7 +46,6 @@ describe('Permanently delete from Trash', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
@@ -69,10 +68,7 @@ describe('Permanently delete from Trash', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.trashcan.emptyTrash(),
- logoutPage.load()
- ]);
+ await apis.user.trashcan.emptyTrash();
done();
});
diff --git a/e2e/suites/actions/restore.test.ts b/e2e/suites/actions/restore.test.ts
index 0b139d9fd..0fceb718a 100755
--- a/e2e/suites/actions/restore.test.ts
+++ b/e2e/suites/actions/restore.test.ts
@@ -24,7 +24,7 @@
*/
import { browser } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { APP_ROUTES } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -38,7 +38,6 @@ describe('Restore from Trash', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
@@ -49,10 +48,7 @@ describe('Restore from Trash', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.trashcan.emptyTrash(),
- logoutPage.load()
- ]);
+ await apis.user.trashcan.emptyTrash();
done();
});
@@ -239,10 +235,7 @@ describe('Restore from Trash', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.trashcan.emptyTrash(),
- logoutPage.load()
- ]);
+ await apis.user.trashcan.emptyTrash();
done();
});
diff --git a/e2e/suites/actions/share-file.test.ts b/e2e/suites/actions/share-file.test.ts
index 37f7edd58..11a52e763 100755
--- a/e2e/suites/actions/share-file.test.ts
+++ b/e2e/suites/actions/share-file.test.ts
@@ -24,7 +24,7 @@
*/
import { browser } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { ShareDialog } from '../../components/dialog/share-dialog';
@@ -44,7 +44,6 @@ describe('Share a file', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
const shareDialog = new ShareDialog();
@@ -61,10 +60,7 @@ describe('Share a file', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.nodes.deleteNodeById(parentId),
- logoutPage.load()
- ]);
+ await apis.user.nodes.deleteNodeById(parentId);
done();
});
diff --git a/e2e/suites/actions/single-click.test.ts b/e2e/suites/actions/single-click.test.ts
index 0d437649a..6e53f78f2 100755
--- a/e2e/suites/actions/single-click.test.ts
+++ b/e2e/suites/actions/single-click.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Viewer } from '../../components/viewer/viewer';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -46,7 +46,6 @@ describe('Single click on item name', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, breadcrumb } = page;
const viewer = new Viewer();
@@ -81,7 +80,6 @@ describe('Single click on item name', () => {
await apis.user.nodes.deleteNodeById(folder1Id);
await apis.user.nodes.deleteNodeById(file1Id);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/actions/special-permissions-available-actions.test.ts b/e2e/suites/actions/special-permissions-available-actions.test.ts
index bc8813926..35c0d046f 100755
--- a/e2e/suites/actions/special-permissions-available-actions.test.ts
+++ b/e2e/suites/actions/special-permissions-available-actions.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY, SITE_ROLES, FILES } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -56,7 +56,6 @@ describe('Granular permissions available actions : ', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
const contextMenu = dataTable.menu;
@@ -99,7 +98,6 @@ describe('Granular permissions available actions : ', () => {
afterAll(async done => {
await apis.admin.sites.deleteSite(siteName);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/actions/toolbar-multiple-selection.test.ts b/e2e/suites/actions/toolbar-multiple-selection.test.ts
index d8f391d91..3773204e6 100755
--- a/e2e/suites/actions/toolbar-multiple-selection.test.ts
+++ b/e2e/suites/actions/toolbar-multiple-selection.test.ts
@@ -24,7 +24,7 @@
*/
import { browser, protractor } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -63,7 +63,6 @@ describe('Toolbar actions - multiple selection : ', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
@@ -105,8 +104,7 @@ describe('Toolbar actions - multiple selection : ', () => {
await Promise.all([
apis.user.nodes.deleteNodesById([file1Id, file2Id, folder1Id, folder2Id]),
apis.user.trashcan.emptyTrash(),
- apis.user.sites.deleteSite(siteName),
- logoutPage.load()
+ apis.user.sites.deleteSite(siteName)
]);
done();
});
diff --git a/e2e/suites/actions/toolbar-single-selection.test.ts b/e2e/suites/actions/toolbar-single-selection.test.ts
index 5356540b9..7d3313a0c 100755
--- a/e2e/suites/actions/toolbar-single-selection.test.ts
+++ b/e2e/suites/actions/toolbar-single-selection.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -46,7 +46,6 @@ describe('Toolbar actions - single selection : ', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
@@ -83,8 +82,7 @@ describe('Toolbar actions - single selection : ', () => {
apis.user.nodes.deleteNodeById(fileUserId),
apis.user.nodes.deleteNodeById(folderUserId),
apis.user.sites.deleteSite(siteName),
- apis.user.trashcan.emptyTrash(),
- logoutPage.load()
+ apis.user.trashcan.emptyTrash()
]);
done();
});
diff --git a/e2e/suites/actions/unshare-file.test.ts b/e2e/suites/actions/unshare-file.test.ts
index f4b4d2b08..c2283ed19 100755
--- a/e2e/suites/actions/unshare-file.test.ts
+++ b/e2e/suites/actions/unshare-file.test.ts
@@ -24,7 +24,7 @@
*/
import { browser } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { ShareDialog } from '../../components/dialog/share-dialog';
@@ -43,7 +43,6 @@ describe('Unshare a file', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, toolbar } = page;
const shareDialog = new ShareDialog();
@@ -59,10 +58,7 @@ describe('Unshare a file', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.nodes.deleteNodeById(parentId),
- logoutPage.load()
- ]);
+ await apis.user.nodes.deleteNodeById(parentId);
done();
});
diff --git a/e2e/suites/actions/upload-file.test.ts b/e2e/suites/actions/upload-file.test.ts
index 6f2db8f87..e44458227 100755
--- a/e2e/suites/actions/upload-file.test.ts
+++ b/e2e/suites/actions/upload-file.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -38,7 +38,6 @@ describe('Upload files', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
@@ -56,10 +55,7 @@ describe('Upload files', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.nodes.deleteNodeById(folder1Id),
- logoutPage.load()
- ]);
+ await apis.user.nodes.deleteNodeById(folder1Id);
done();
});
diff --git a/e2e/suites/application/general.test.ts b/e2e/suites/application/general.test.ts
index 5420f16fc..14f9e7f7c 100644
--- a/e2e/suites/application/general.test.ts
+++ b/e2e/suites/application/general.test.ts
@@ -24,14 +24,13 @@
*/
import { browser } from 'protractor';
-import { BrowsingPage, LoginPage, LogoutPage } from '../../pages/pages';
+import { BrowsingPage, LoginPage } from '../../pages/pages';
import { CreateOrEditFolderDialog } from '../../components/dialog/create-edit-folder-dialog';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
describe('General', () => {
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const createDialog = new CreateOrEditFolderDialog();
const adminApi = new RepoClient();
@@ -48,7 +47,6 @@ describe('General', () => {
afterAll(async (done) => {
await nodesApi.deleteNodeById(folderId);
- await logoutPage.load();
done();
});
@@ -62,12 +60,12 @@ describe('General', () => {
await authApi.logout();
await createDialog.clickCreate();
- expect(await browser.getTitle()).toContain('Sign in');
- // const message = await page.getSnackBarMessage();
- // expect(message).toEqual('The action was unsuccessful. Try again or contact your IT Team.');
- await createDialog.waitForDialogToClose();
- expect(createDialog.component.isPresent()).not.toBe(true, 'dialog is present');
+ const message = await page.getSnackBarMessage();
+ expect(message).toEqual('The action was unsuccessful. Try again or contact your IT Team.');
+
+ expect(await browser.getTitle()).toContain('Sign in');
+ expect(await createDialog.isDialogOpen()).not.toBe(true, 'dialog is present');
});
});
});
diff --git a/e2e/suites/application/page-titles.test.ts b/e2e/suites/application/page-titles.test.ts
index 05cf20e8a..ac3c6136a 100755
--- a/e2e/suites/application/page-titles.test.ts
+++ b/e2e/suites/application/page-titles.test.ts
@@ -26,14 +26,13 @@
import { browser } from 'protractor';
import { SIDEBAR_LABELS, PAGE_TITLES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
describe('Page titles', () => {
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const adminApi = new RepoClient();
const { nodes: nodesApi } = adminApi;
@@ -71,10 +70,7 @@ describe('Page titles', () => {
});
afterAll(async (done) => {
- await Promise.all([
- logoutPage.load(),
- adminApi.nodes.deleteNodeById(fileId)
- ]);
+ await adminApi.nodes.deleteNodeById(fileId);
done();
});
diff --git a/e2e/suites/authentication/login.test.ts b/e2e/suites/authentication/login.test.ts
index e39e8118e..85b280eef 100755
--- a/e2e/suites/authentication/login.test.ts
+++ b/e2e/suites/authentication/login.test.ts
@@ -26,7 +26,7 @@
import { browser } from 'protractor';
import { APP_ROUTES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { navigate } from '../../utilities/browser-utils';
@@ -34,7 +34,6 @@ import { navigate } from '../../utilities/browser-utils';
describe('Login', () => {
const peopleApi = new RepoClient().people;
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
/* cspell:disable-next-line */
const testUser = `user-${Utils.random()}@alfness`;
@@ -70,7 +69,6 @@ describe('Login', () => {
});
afterEach(async (done) => {
- await logoutPage.load();
await Utils.clearLocalStorage();
done();
});
@@ -147,7 +145,6 @@ describe('Login', () => {
it('user is able to login after changing his password - [C213104]', async () => {
await loginPage.loginWith(testUser2.username, testUser2.password);
- await logoutPage.load();
await peopleApi.changePassword(testUser2.username, newPassword);
await loginPage.loginWith(testUser2.username, newPassword);
expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.PERSONAL_FILES);
diff --git a/e2e/suites/authentication/logout.test.ts b/e2e/suites/authentication/logout.test.ts
index 1d0aabc7c..e0bef04bb 100755
--- a/e2e/suites/authentication/logout.test.ts
+++ b/e2e/suites/authentication/logout.test.ts
@@ -24,7 +24,7 @@
*/
import { browser } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { APP_ROUTES } from '../../configs';
@@ -32,7 +32,6 @@ import { APP_ROUTES } from '../../configs';
describe('Logout', () => {
const page = new BrowsingPage();
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const peopleApi = new RepoClient().people;
@@ -48,11 +47,6 @@ describe('Logout', () => {
done();
});
- afterEach(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('Sign out option is available - [C213143]', async () => {
await page.header.userInfo.openMenu();
expect(await page.header.userInfo.menu.isMenuItemPresent('Sign out')).toBe(true, 'Sign out option not displayed');
diff --git a/e2e/suites/extensions/ext-context-submenus.test.ts b/e2e/suites/extensions/ext-context-submenus.test.ts
index 4768f2de4..d28691f5d 100644
--- a/e2e/suites/extensions/ext-context-submenus.test.ts
+++ b/e2e/suites/extensions/ext-context-submenus.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { EXTENSIBILITY_CONFIGS } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -52,7 +52,6 @@ describe('Extensions - Context submenu', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const {dataTable} = page;
const contextMenu = dataTable.menu;
@@ -79,7 +78,6 @@ describe('Extensions - Context submenu', () => {
afterAll(async (done) => {
await apis.user.nodes.deleteNodeById(fileId, true);
await apis.user.nodes.deleteNodeById(folderId, true);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/extensions/ext-document-list.test.ts b/e2e/suites/extensions/ext-document-list.test.ts
index 2d2ef9231..9e4314c75 100644
--- a/e2e/suites/extensions/ext-document-list.test.ts
+++ b/e2e/suites/extensions/ext-document-list.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { BrowsingPage, LoginPage, LogoutPage } from '../../pages/pages';
+import { BrowsingPage, LoginPage } from '../../pages/pages';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { EXTENSIBILITY_CONFIGS } from '../../configs';
import { Utils } from '../../utilities/utils';
@@ -63,7 +63,6 @@ describe('Extensions - DocumentList presets', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
@@ -85,7 +84,6 @@ describe('Extensions - DocumentList presets', () => {
afterAll(async (done) => {
await apis.user.nodes.deleteNodeById(fileId);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/extensions/ext-header.test.ts b/e2e/suites/extensions/ext-header.test.ts
index 0b21edfc9..041935059 100755
--- a/e2e/suites/extensions/ext-header.test.ts
+++ b/e2e/suites/extensions/ext-header.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage } from '../../pages/pages';
+import { LoginPage } from '../../pages/pages';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { EXTENSIBILITY_CONFIGS } from '../../configs';
import { Utils } from '../../utilities/utils';
@@ -56,7 +56,6 @@ describe('Extensions - Info Drawer', () => {
const toolbarMenu = new Menu();
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
beforeAll(async (done) => {
await apis.admin.people.createUser({ username });
@@ -71,11 +70,6 @@ describe('Extensions - Info Drawer', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('Add a new button in the header - [C286474]', async () => {
await header.openMoreMenu();
expect(await toolbarMenu.isMenuItemPresent(enabledMenu.title)).toBe(true, 'menu item not present');
diff --git a/e2e/suites/extensions/ext-info-drawer.test.ts b/e2e/suites/extensions/ext-info-drawer.test.ts
index 2053fdb4a..93aea332b 100755
--- a/e2e/suites/extensions/ext-info-drawer.test.ts
+++ b/e2e/suites/extensions/ext-info-drawer.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { InfoDrawer } from './../../components/info-drawer/info-drawer';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { EXTENSIBILITY_CONFIGS } from '../../configs';
@@ -65,7 +65,6 @@ describe('Extensions - Info Drawer', () => {
const infoDrawer = new InfoDrawer();
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
beforeAll(async (done) => {
@@ -93,11 +92,6 @@ describe('Extensions - Info Drawer', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('Add a new tab with icon and title - [C284646]', async () => {
await page.dataTable.selectItem(file);
await page.toolbar.getButtonByTitleAttribute('View details').click();
@@ -154,11 +148,6 @@ describe('Extensions - Info Drawer', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('Remove all tabs - [C284650]', async () => {
await page.dataTable.selectItem(file);
await page.toolbar.getButtonByTitleAttribute('View details').click();
diff --git a/e2e/suites/extensions/ext-metadata.test.ts b/e2e/suites/extensions/ext-metadata.test.ts
index a61dfe727..44fda466e 100644
--- a/e2e/suites/extensions/ext-metadata.test.ts
+++ b/e2e/suites/extensions/ext-metadata.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { BrowsingPage, LoginPage, LogoutPage } from '../../pages/pages';
+import { BrowsingPage, LoginPage } from '../../pages/pages';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { EXTENSIBILITY_CONFIGS } from '../../configs';
import { Utils } from '../../utilities/utils';
@@ -66,7 +66,6 @@ describe('Extensions - Metadata presets', () => {
const metadataCard = new MetadataCard();
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
beforeAll(async done => {
@@ -96,7 +95,6 @@ describe('Extensions - Metadata presets', () => {
afterAll(async done => {
await apis.user.nodes.deleteNodeById(fileId);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/extensions/ext-viewer.test.ts b/e2e/suites/extensions/ext-viewer.test.ts
index 9f8f4ae30..e6ec95ea6 100755
--- a/e2e/suites/extensions/ext-viewer.test.ts
+++ b/e2e/suites/extensions/ext-viewer.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Viewer } from './../../components/components';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { EXTENSIBILITY_CONFIGS, FILES } from '../../configs';
@@ -72,7 +72,6 @@ describe('Extensions - Viewer', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const viewer = new Viewer();
@@ -91,7 +90,6 @@ describe('Extensions - Viewer', () => {
afterAll(async (done) => {
await apis.user.nodes.deleteNodesById([ pdfFileId, docxFileId ]);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/info-drawer/library-properties.test.ts b/e2e/suites/info-drawer/library-properties.test.ts
index 55ac0f8c8..fe67eb3f0 100755
--- a/e2e/suites/info-drawer/library-properties.test.ts
+++ b/e2e/suites/info-drawer/library-properties.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { InfoDrawer } from './../../components/info-drawer/info-drawer';
@@ -64,7 +64,6 @@ describe('Library properties', () => {
const infoDrawer = new InfoDrawer();
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
@@ -87,7 +86,6 @@ describe('Library properties', () => {
await apis.user.sites.deleteSite(site.id);
await apis.user.sites.deleteSite(siteForUpdate.id);
await apis.user.sites.deleteSite(siteDup);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/list-views/empty-list.test.ts b/e2e/suites/list-views/empty-list.test.ts
index aa31eccb6..725327c87 100755
--- a/e2e/suites/list-views/empty-list.test.ts
+++ b/e2e/suites/list-views/empty-list.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -37,7 +37,6 @@ describe('Empty list views', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, pagination } = page;
@@ -47,11 +46,6 @@ describe('Empty list views', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('empty Personal Files - [C280131]', async () => {
await page.clickPersonalFiles();
expect(await dataTable.isEmptyList()).toBe(true, 'list is not empty');
diff --git a/e2e/suites/list-views/favorites.test.ts b/e2e/suites/list-views/favorites.test.ts
index 874e17a29..d4f442671 100755
--- a/e2e/suites/list-views/favorites.test.ts
+++ b/e2e/suites/list-views/favorites.test.ts
@@ -24,7 +24,7 @@
*/
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -45,7 +45,6 @@ describe('Favorites', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, breadcrumb } = page;
@@ -85,7 +84,6 @@ describe('Favorites', () => {
await apis.admin.sites.deleteSite(siteName);
await apis.user.nodes.deleteNodes([ favFolderName, parentFolder ]);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/list-views/file-libraries.test.ts b/e2e/suites/list-views/file-libraries.test.ts
index dcbea7132..7d8c3dc37 100755
--- a/e2e/suites/list-views/file-libraries.test.ts
+++ b/e2e/suites/list-views/file-libraries.test.ts
@@ -24,7 +24,7 @@
*/
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -48,7 +48,6 @@ describe('File Libraries', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
@@ -77,7 +76,6 @@ describe('File Libraries', () => {
afterAll(async (done) => {
await apis.admin.sites.deleteSites([ sitePublic, siteModerated, sitePrivate, adminSite, siteId1, siteId2 ]);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/list-views/generic-errors.test.ts b/e2e/suites/list-views/generic-errors.test.ts
index 7e5a72831..b572bb43f 100755
--- a/e2e/suites/list-views/generic-errors.test.ts
+++ b/e2e/suites/list-views/generic-errors.test.ts
@@ -24,7 +24,7 @@
*/
import { browser } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -43,7 +43,6 @@ describe('Generic errors', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
@@ -61,7 +60,6 @@ describe('Generic errors', () => {
afterAll(async (done) => {
await apis.user.nodes.deleteNodeById(parentId);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
@@ -90,14 +88,12 @@ describe('Generic errors', () => {
await dataTable.doubleClickOnRowByName(parent);
await dataTable.doubleClickOnRowByName(file2);
const URL = await browser.getCurrentUrl();
- await logoutPage.load();
await loginPage.loginWith(username2);
await browser.get(URL);
expect(await page.isGenericErrorDisplayed()).toBe(true, 'Generic error page not displayed');
expect(await page.getGenericErrorTitle()).toContain(`This file or folder no longer exists or you don't have permission to view it.`);
- await logoutPage.load();
await loginPage.loginWith(username);
});
});
diff --git a/e2e/suites/list-views/permissions.test.ts b/e2e/suites/list-views/permissions.test.ts
index d0992fec3..c42e8434a 100755
--- a/e2e/suites/list-views/permissions.test.ts
+++ b/e2e/suites/list-views/permissions.test.ts
@@ -24,7 +24,7 @@
*/
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -38,7 +38,6 @@ describe('Special permissions', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
@@ -76,10 +75,7 @@ describe('Special permissions', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.admin.sites.deleteSite(sitePrivate),
- logoutPage.load()
- ]);
+ await apis.admin.sites.deleteSite(sitePrivate);
done();
});
@@ -128,10 +124,7 @@ describe('Special permissions', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.admin.sites.deleteSite(sitePrivate),
- logoutPage.load()
- ]);
+ await apis.admin.sites.deleteSite(sitePrivate);
done();
});
diff --git a/e2e/suites/list-views/personal-files.test.ts b/e2e/suites/list-views/personal-files.test.ts
index 3efc69d11..8cabd3255 100755
--- a/e2e/suites/list-views/personal-files.test.ts
+++ b/e2e/suites/list-views/personal-files.test.ts
@@ -26,7 +26,7 @@
import { browser } from 'protractor';
import { APP_ROUTES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -39,7 +39,6 @@ describe('Personal Files', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
@@ -79,11 +78,6 @@ describe('Personal Files', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('has Data Dictionary and created content - [C213241]', async () => {
expect(await dataTable.getRowByName('Data Dictionary').isPresent()).toBe(true);
expect(await dataTable.getRowByName(adminFolder).isPresent()).toBe(true);
@@ -101,11 +95,6 @@ describe('Personal Files', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('has the correct columns - [C217142]', async () => {
const labels = [ 'Name', 'Size', 'Modified', 'Modified by' ];
const elements = labels.map(label => dataTable.getColumnHeaderByLabel(label));
diff --git a/e2e/suites/list-views/recent-files.test.ts b/e2e/suites/list-views/recent-files.test.ts
index 79e343ea1..112c4df32 100755
--- a/e2e/suites/list-views/recent-files.test.ts
+++ b/e2e/suites/list-views/recent-files.test.ts
@@ -24,7 +24,7 @@
*/
import { SITE_VISIBILITY } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -46,7 +46,6 @@ describe('Recent Files', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, breadcrumb } = page;
@@ -78,7 +77,6 @@ describe('Recent Files', () => {
await apis.user.nodes.deleteNodesById([ folderId, file2Id ]);
await apis.user.sites.deleteSite(siteName);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/list-views/shared-files.test.ts b/e2e/suites/list-views/shared-files.test.ts
index 192c0a99a..76c68a5a8 100755
--- a/e2e/suites/list-views/shared-files.test.ts
+++ b/e2e/suites/list-views/shared-files.test.ts
@@ -24,7 +24,7 @@
*/
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -47,7 +47,6 @@ describe('Shared Files', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, breadcrumb } = page;
@@ -84,7 +83,6 @@ describe('Shared Files', () => {
await apis.admin.sites.deleteSite(siteName);
await apis.user.nodes.deleteNodeById(folderId);
await apis.user.nodes.deleteNodeById(file4Id);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/list-views/tooltips.test.ts b/e2e/suites/list-views/tooltips.test.ts
index b08e5a015..dfb60346b 100755
--- a/e2e/suites/list-views/tooltips.test.ts
+++ b/e2e/suites/list-views/tooltips.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -51,7 +51,6 @@ describe('File / folder tooltips', () => {
const fileDescription = 'file description';
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable } = page;
@@ -81,8 +80,7 @@ describe('File / folder tooltips', () => {
afterAll(async (done) => {
await Promise.all([
apis.user.nodes.deleteNodes([ parent ]),
- apis.user.trashcan.emptyTrash(),
- logoutPage.load()
+ apis.user.trashcan.emptyTrash()
]);
done();
});
diff --git a/e2e/suites/list-views/trash.test.ts b/e2e/suites/list-views/trash.test.ts
index df9d83b06..8f7426dc3 100755
--- a/e2e/suites/list-views/trash.test.ts
+++ b/e2e/suites/list-views/trash.test.ts
@@ -24,7 +24,7 @@
*/
import { SITE_VISIBILITY, SITE_ROLES } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -52,7 +52,6 @@ describe('Trash', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, breadcrumb } = page;
@@ -101,11 +100,6 @@ describe('Trash', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('has the correct columns - [C213217]', async () => {
const labels = [ 'Name', 'Location', 'Size', 'Deleted', 'Deleted by' ];
const elements = labels.map(label => dataTable.getColumnHeaderByLabel(label));
@@ -139,11 +133,6 @@ describe('Trash', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('has the correct columns - [C280494]', async () => {
const labels = [ 'Name', 'Location', 'Size', 'Deleted'];
const elements = labels.map(label => dataTable.getColumnHeaderByLabel(label));
diff --git a/e2e/suites/navigation/breadcrumb.test.ts b/e2e/suites/navigation/breadcrumb.test.ts
index a48e44dc0..fdeda39c6 100755
--- a/e2e/suites/navigation/breadcrumb.test.ts
+++ b/e2e/suites/navigation/breadcrumb.test.ts
@@ -26,7 +26,7 @@
import { browser } from 'protractor';
import { SITE_VISIBILITY } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -45,7 +45,6 @@ describe('Breadcrumb', () => {
const folder1Renamed = `renamed-${Utils.random()}`;
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { breadcrumb } = page;
@@ -79,8 +78,7 @@ describe('Breadcrumb', () => {
await Promise.all([
apis.user.nodes.deleteNodeById(parentId),
apis.user.nodes.deleteNodeById(parent2Id),
- apis.user.sites.deleteSite(siteName),
- logoutPage.load()
+ apis.user.sites.deleteSite(siteName)
]);
done();
});
@@ -188,7 +186,6 @@ describe('Breadcrumb', () => {
const user2Api = new RepoClient(user2, user2);
beforeAll(async (done) => {
- await logoutPage.load();
await apis.admin.people.createUser({ username: user2 });
userFolderId = (await user2Api.nodes.createFolder(userFolder)).entry.id;
await loginPage.loginWithAdmin();
@@ -196,10 +193,7 @@ describe('Breadcrumb', () => {
});
afterAll(async (done) => {
- await Promise.all([
- user2Api.nodes.deleteNodeById(userFolderId),
- logoutPage.load()
- ]);
+ await user2Api.nodes.deleteNodeById(userFolderId);
done();
});
diff --git a/e2e/suites/navigation/sidebar.test.ts b/e2e/suites/navigation/sidebar.test.ts
index 5aa1ff128..52a4921f5 100755
--- a/e2e/suites/navigation/sidebar.test.ts
+++ b/e2e/suites/navigation/sidebar.test.ts
@@ -26,11 +26,10 @@
import { browser } from 'protractor';
import { APP_ROUTES, SIDEBAR_LABELS } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
describe('Sidebar', () => {
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { sidenav } = page;
@@ -39,11 +38,6 @@ describe('Sidebar', () => {
done();
});
- afterAll(async (done) => {
- await logoutPage.load();
- done();
- });
-
it('has "Personal Files" as default - [C217149]', async () => {
expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.PERSONAL_FILES);
expect(await sidenav.isActiveByLabel('Personal Files')).toBe(true, 'Active link');
diff --git a/e2e/suites/pagination/pag-favorites.test.ts b/e2e/suites/pagination/pag-favorites.test.ts
index 2bd64b4de..5eb438bfe 100755
--- a/e2e/suites/pagination/pag-favorites.test.ts
+++ b/e2e/suites/pagination/pag-favorites.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -43,7 +43,6 @@ describe('Pagination on multiple pages on Favorites', () => {
let filesIds;
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, pagination } = page;
@@ -69,7 +68,6 @@ describe('Pagination on multiple pages on Favorites', () => {
afterAll(async (done) => {
await apis.user.nodes.deleteNodeById(parentId);
- await logoutPage.load();
await apis.user.favorites.waitForApi({ expect: 0 });
done();
});
diff --git a/e2e/suites/pagination/pag-file-libraries.test.ts b/e2e/suites/pagination/pag-file-libraries.test.ts
index b15dfe122..37c969e3c 100755
--- a/e2e/suites/pagination/pag-file-libraries.test.ts
+++ b/e2e/suites/pagination/pag-file-libraries.test.ts
@@ -24,7 +24,7 @@
*/
import { SITE_VISIBILITY } from '../../configs';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -36,7 +36,6 @@ describe('Pagination on multiple pages on File Libraries', () => {
user: new RepoClient(username, username)
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, pagination } = page;
@@ -63,10 +62,7 @@ describe('Pagination on multiple pages on File Libraries', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.sites.deleteSites(sites),
- logoutPage.load()
- ]);
+ await apis.user.sites.deleteSites(sites);
done();
})
diff --git a/e2e/suites/pagination/pag-personal-files.test.ts b/e2e/suites/pagination/pag-personal-files.test.ts
index bab097b57..488783b17 100755
--- a/e2e/suites/pagination/pag-personal-files.test.ts
+++ b/e2e/suites/pagination/pag-personal-files.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -41,7 +41,6 @@ describe('Pagination on multiple pages on Personal Files', () => {
.map((name, index): string => `${name}-${index + 1}.txt`);
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, pagination } = page;
@@ -65,10 +64,7 @@ describe('Pagination on multiple pages on Personal Files', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.nodes.deleteNodeById(parentId),
- logoutPage.load()
- ]);
+ await apis.user.nodes.deleteNodeById(parentId);
done();
});
diff --git a/e2e/suites/pagination/pag-recent-files.test.ts b/e2e/suites/pagination/pag-recent-files.test.ts
index 70548a0af..cd09fad93 100755
--- a/e2e/suites/pagination/pag-recent-files.test.ts
+++ b/e2e/suites/pagination/pag-recent-files.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -41,7 +41,6 @@ describe('Pagination on multiple pages on Recent Files', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, pagination } = page;
@@ -65,10 +64,7 @@ describe('Pagination on multiple pages on Recent Files', () => {
});
afterAll(async (done) => {
- await Promise.all([
- apis.user.nodes.deleteNodeById(parentId),
- logoutPage.load()
- ]);
+ await apis.user.nodes.deleteNodeById(parentId);
done();
});
diff --git a/e2e/suites/pagination/pag-shared-files.test.ts b/e2e/suites/pagination/pag-shared-files.test.ts
index 90f8fc22e..7d4597590 100755
--- a/e2e/suites/pagination/pag-shared-files.test.ts
+++ b/e2e/suites/pagination/pag-shared-files.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -42,7 +42,6 @@ describe('Pagination on multiple pages on Shared Files', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, pagination } = page;
@@ -69,7 +68,6 @@ describe('Pagination on multiple pages on Shared Files', () => {
afterAll(async (done) => {
await apis.user.nodes.deleteNodeById(parentId);
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/pagination/pag-single-page.test.ts b/e2e/suites/pagination/pag-single-page.test.ts
index 964b22882..fc912bb08 100755
--- a/e2e/suites/pagination/pag-single-page.test.ts
+++ b/e2e/suites/pagination/pag-single-page.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -41,9 +41,8 @@ describe('Pagination on single page', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
- const { dataTable, pagination } = page;
+ const { pagination } = page;
beforeAll(async (done) => {
await apis.admin.people.createUser({ username });
@@ -74,8 +73,7 @@ describe('Pagination on single page', () => {
await Promise.all([
apis.user.nodes.deleteNodeById(fileId),
apis.user.sites.deleteSite(siteId),
- apis.user.trashcan.emptyTrash(),
- logoutPage.load()
+ apis.user.trashcan.emptyTrash()
]);
done();
});
diff --git a/e2e/suites/pagination/pag-trash.test.ts b/e2e/suites/pagination/pag-trash.test.ts
index 39a043a15..93abb03fb 100755
--- a/e2e/suites/pagination/pag-trash.test.ts
+++ b/e2e/suites/pagination/pag-trash.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { Utils } from '../../utilities/utils';
import { RepoClient } from '../../utilities/repo-client/repo-client';
@@ -40,7 +40,6 @@ describe('Pagination on multiple pages on Trash', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const { dataTable, pagination } = page;
@@ -65,7 +64,6 @@ describe('Pagination on multiple pages on Trash', () => {
afterAll(async (done) => {
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/viewer/viewer-actions.test.ts b/e2e/suites/viewer/viewer-actions.test.ts
index 3f3f5bd2d..4a9a10cc2 100755
--- a/e2e/suites/viewer/viewer-actions.test.ts
+++ b/e2e/suites/viewer/viewer-actions.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
-import { LoginPage, BrowsingPage, LogoutPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { FILES } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -45,7 +45,6 @@ describe('Viewer actions', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const dataTable = page.dataTable;
const viewer = new Viewer();
@@ -96,7 +95,6 @@ describe('Viewer actions', () => {
await apis.user.nodes.deleteNodeById(parentId);
await apis.user.nodes.deleteNodeById(destinationId);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
@@ -276,7 +274,6 @@ describe('Viewer actions', () => {
await apis.user.sites.deleteSite(siteName);
await apis.user.nodes.deleteNodeById(destinationId);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
@@ -410,7 +407,6 @@ describe('Viewer actions', () => {
await apis.user.nodes.deleteNodeById(parentId);
await apis.user.nodes.deleteNodeById(destinationId);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
@@ -545,7 +541,6 @@ describe('Viewer actions', () => {
await apis.user.nodes.deleteNodeById(parentId);
await apis.user.nodes.deleteNodeById(destinationId);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
@@ -683,7 +678,6 @@ describe('Viewer actions', () => {
await apis.user.nodes.deleteNodeById(parentId);
await apis.user.nodes.deleteNodeById(destinationId);
await apis.user.trashcan.emptyTrash();
- await logoutPage.load();
done();
});
diff --git a/e2e/suites/viewer/viewer-general.test.ts b/e2e/suites/viewer/viewer-general.test.ts
index 0c0a66a97..2a5f72ba5 100755
--- a/e2e/suites/viewer/viewer-general.test.ts
+++ b/e2e/suites/viewer/viewer-general.test.ts
@@ -24,7 +24,7 @@
*/
import { protractor, browser } from 'protractor';
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, BrowsingPage } from '../../pages/pages';
import { FILES, SITE_VISIBILITY } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
@@ -49,7 +49,6 @@ describe('Viewer general', () => {
};
const loginPage = new LoginPage();
- const logoutPage = new LogoutPage();
const page = new BrowsingPage();
const dataTable = page.dataTable;
const viewer = new Viewer();
@@ -92,7 +91,6 @@ describe('Viewer general', () => {
await apis.user.nodes.deleteNodeById(parentId);
await apis.admin.sites.deleteSite(siteAdmin);
await apis.user.sites.deleteSite(siteUser);
- await logoutPage.load();
done();
});