Skip to content

Commit

Permalink
refactor: remove calls to basepage.goto, use relative baseUrl
Browse files Browse the repository at this point in the history
  • Loading branch information
Ramon Souza committed Jun 26, 2022
1 parent 4568426 commit d36fcdb
Show file tree
Hide file tree
Showing 17 changed files with 68 additions and 87 deletions.
15 changes: 8 additions & 7 deletions apps/meteor/tests/e2e/00-wizard.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { test, expect } from '@playwright/test';
import { test, expect, Page } from '@playwright/test';

import { VALID_EMAIL, adminLogin } from './utils/mocks/userAndPasswordMock';
import { setupWizardStepRegex } from './utils/mocks/urlMock';
Expand All @@ -8,16 +8,17 @@ import { LoginPage, SetupWizard } from './pageobjects';
test.describe('[Wizard]', () => {
let setupWizard: SetupWizard;
let loginPage: LoginPage;
let page: Page;

test.beforeEach(async ({ page }) => {
test.beforeEach(async ({ browser }) => {
page = await browser.newPage();
setupWizard = new SetupWizard(page);
loginPage = new LoginPage(page);
});

test.describe('[Step 2]', async () => {
test.beforeEach(async ({ baseURL }) => {
const baseUrl = baseURL;
await setupWizard.goto(baseUrl as string);
test.beforeEach(async () => {
await page.goto('/');
await loginPage.doLogin(adminLogin, false);
});

Expand All @@ -33,7 +34,7 @@ test.describe('[Wizard]', () => {

test.describe('[Step 3]', async () => {
test.beforeEach(async () => {
await setupWizard.goto('');
await page.goto('');
await loginPage.doLogin(adminLogin, false);
await setupWizard.stepTwoSuccess();
});
Expand Down Expand Up @@ -63,7 +64,7 @@ test.describe('[Wizard]', () => {

test.describe('[Final Step]', async () => {
test.beforeEach(async () => {
await setupWizard.goto('');
await page.goto('');
await loginPage.doLogin(adminLogin, false);
await setupWizard.stepTwoSuccess();
await setupWizard.stepThreeSuccess();
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/tests/e2e/01-forgot-password.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ test.describe('[Forgot Password]', () => {
let loginPage: LoginPage;
let global: Global;

test.beforeEach(async ({ page, baseURL }) => {
test.beforeEach(async ({ page }) => {
loginPage = new LoginPage(page);
global = new Global(page);
const baseUrl = baseURL as string;
await loginPage.goto(baseUrl);

await page.goto('/');
await loginPage.gotToForgotPassword();
});

Expand Down
5 changes: 2 additions & 3 deletions apps/meteor/tests/e2e/02-register.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ import { LoginPage } from './pageobjects';
test.describe('[Register]', () => {
let loginPage: LoginPage;

test.beforeEach(async ({ page, baseURL }) => {
const URL = baseURL as string;
test.beforeEach(async ({ page }) => {
loginPage = new LoginPage(page);
await loginPage.goto(URL);
await page.goto('/');
});

test('expect user click in register button without data', async () => {
Expand Down
5 changes: 2 additions & 3 deletions apps/meteor/tests/e2e/03-login.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ test.describe('[Login]', () => {
let loginPage: LoginPage;
let global: Global;

test.beforeEach(async ({ page, baseURL }) => {
const baseUrl = baseURL;
test.beforeEach(async ({ page }) => {
loginPage = new LoginPage(page);
global = new Global(page);
await loginPage.goto(baseUrl as string);
await page.goto('/');
});

test('expect user write a password incorrectly', async () => {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/04-main-elements-render.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test.describe('[Main Elements Render]', function () {
mainContent = new MainContent(page);
flexTab = new FlexTab(page);

await loginPage.goto('/');
await page.goto('/');
await loginPage.doLogin(adminLogin);
});

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/05-channel-creation.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test.describe('[Channel]', async () => {
loginPage = new LoginPage(page);
sideNav = new SideNav(page);

await loginPage.goto('/');
await page.goto('/');
await loginPage.doLogin(adminLogin);
});

Expand Down
10 changes: 4 additions & 6 deletions apps/meteor/tests/e2e/06-messaging.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const createBrowserContextForChat = async (
const mainContent = new MainContent(page);
const sideNav = new SideNav(page);

await loginPage.goto(baseURL);
await page.goto(baseURL);
await loginPage.doLogin(validUserInserted);

return { mainContent, sideNav };
Expand All @@ -27,17 +27,15 @@ test.describe('[Messaging]', () => {
let mainContent: MainContent;
let sideNav: SideNav;
let flexTab: FlexTab;
test.beforeAll(async ({ browser, baseURL }) => {
const context = await browser.newContext();
const page = await context.newPage();
test.beforeAll(async ({ browser }) => {
const page = await browser.newPage();

loginPage = new LoginPage(page);
mainContent = new MainContent(page);
sideNav = new SideNav(page);
flexTab = new FlexTab(page);

await loginPage.goto(baseURL as string);

await page.goto('/');
await loginPage.doLogin(adminLogin);
});

Expand Down
11 changes: 4 additions & 7 deletions apps/meteor/tests/e2e/07-emoji.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@ test.describe('[Emoji]', () => {
let mainContent: MainContent;
let sideNav: SideNav;

test.beforeAll(async ({ browser, baseURL }) => {
const context = await browser.newContext();
const page = await context.newPage();
const URL = baseURL as string;
test.beforeAll(async ({ browser }) => {
const page = await browser.newPage();
loginPage = new LoginPage(page);
await loginPage.goto(URL);

await loginPage.doLogin(adminLogin);
sideNav = new SideNav(page);
mainContent = new MainContent(page);

await page.goto('/');
await loginPage.doLogin(adminLogin);
await sideNav.doOpenChat('general');
});

Expand Down
55 changes: 23 additions & 32 deletions apps/meteor/tests/e2e/08-resolutions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,34 @@ let mainContent: MainContent;
let sideNav: SideNav;
let global: Global;

async function initConfig(
browser: Browser,
baseURL: string | undefined,
options = { viewport: { width: 650, height: 800 } },
): Promise<any> {
const context = await browser.newContext(options);
const page = await context.newPage();
const URL = baseURL as string;
async function initConfig(browser: Browser, options = { viewport: { width: 650, height: 800 } }): Promise<any> {
const page = await browser.newPage(options);
loginPage = new LoginPage(page);
await loginPage.goto(URL);

await loginPage.doLogin(adminLogin);
sideNav = new SideNav(page);
mainContent = new MainContent(page);
global = new Global(page);

await page.goto('/');
await loginPage.doLogin(adminLogin);
return { loginPage, sideNav, mainContent };
}

test.describe('[Resolution]', function () {
test.describe('[Mobile Render]', async () => {
test.beforeAll(async ({ browser, baseURL }) => {
await initConfig(browser, baseURL);
test.beforeAll(async ({ browser }) => {
await initConfig(browser);
});

test.afterAll(async ({ browser, baseURL }) => {
await initConfig(browser, baseURL, { viewport: { width: 1600, height: 1600 } });
test.afterAll(async ({ browser }) => {
await initConfig(browser, { viewport: { width: 1600, height: 1600 } });

await expect(sideNav.spotlightSearchIcon).toBeVisible();
});

test('expect close the sidenav', async () => {
const position = await mainContent.mainContent.boundingBox();
await expect(position?.x).toEqual(0);
await expect(await sideNav.isSideBarOpen()).toBeFalsy;
expect(position?.x).toEqual(0);
expect(await sideNav.isSideBarOpen()).toBeFalsy;
});

test.describe('moving elements:', async () => {
Expand All @@ -53,24 +47,24 @@ test.describe('[Resolution]', function () {

test('expect open the sidenav', async () => {
const position = await mainContent.mainContent.boundingBox();
await expect(position?.x).toEqual(0);
await expect(await sideNav.isSideBarOpen()).toBeTruthy;
expect(position?.x).toEqual(0);
expect(await sideNav.isSideBarOpen()).toBeTruthy;
});

test('expect not close sidebar on pressing the sidebar item menu', async () => {
await sideNav.firstSidebarItemMenu.click();

const position = await mainContent.mainContent.boundingBox();
await expect(position?.x).toEqual(0);
expect(position?.x).toEqual(0);

await expect(await sideNav.isSideBarOpen()).toBeTruthy;
expect(await sideNav.isSideBarOpen()).toBeTruthy;

await sideNav.firstSidebarItemMenu.click();
});

test('expect close the sidenav when open general channel', async () => {
await sideNav.doOpenChat('general');
await expect(await sideNav.isSideBarOpen()).toBeFalsy;
expect(await sideNav.isSideBarOpen()).toBeFalsy;
});

test.describe('Preferences', async () => {
Expand All @@ -87,22 +81,19 @@ test.describe('[Resolution]', function () {
await sideNav.returnToMenuInLowResolution.click();
});

test('expect close the sidenav when press the preferences link', async () => {
test.skip('expect close the sidenav when press the preferences link', async () => {
await sideNav.preferences.click();
await sideNav.page.mouse.click(640, 30);
await expect(await global.flexNav.isVisible()).toBeFalsy;
await expect(global.flexNav).toBeHidden();
});

test('expect close the sidenav when press the profile link', async () => {
test.skip('expect close the sidenav when press the profile link', async () => {
await sideNav.profile.click();
await sideNav.page.mouse.click(640, 30);
await expect(await sideNav.flexNav.isVisible()).toBeFalsy;
await expect(sideNav.flexNav).toBeHidden();
});

test('expect close the preferences nav', async () => {
await sideNav.preferencesClose.click();
await sideNav.page.mouse.click(640, 30);
await expect(await sideNav.flexNav.isVisible()).toBeTruthy;
test.skip('expect close the preferences nav', async () => {
await sideNav.btnCloseSidenav.click();
await expect(sideNav.flexNav).toBeHidden();
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/09-channel.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ test.describe('[Channel]', () => {
flexTab = new FlexTab(page);
global = new Global(page);

await loginPage.goto('/');
await page.goto('/');
await loginPage.doLogin(adminLogin);

if (!publicChannelCreated) {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/10-user-preferences.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ test.describe('[User Preferences]', () => {
preferencesMainContent = new PreferencesMainContent(page);
flexTab = new FlexTab(page);

await loginPage.goto('/');
await page.goto('/');
await loginPage.doLogin(adminLogin);
await sideNav.sidebarUserMenu.click();
await sideNav.account.click();
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/tests/e2e/11-admin.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ test.describe('[Administration]', () => {
let flexTab: FlexTab;
const checkBoxesSelectors = ['Direct', 'Public', 'Private', 'Omnichannel', 'Discussions', 'Teams'];

test.beforeAll(async ({ browser, baseURL }) => {
const context = await browser.newContext();
const page = await context.newPage();
test.beforeAll(async ({ browser }) => {
const page = await browser.newPage();
loginPage = new LoginPage(page);
sideNav = new SideNav(page);
flexTab = new FlexTab(page);
admin = new Administration(page);
await loginPage.goto(baseURL as string);

await page.goto('/');
await loginPage.doLogin(adminLogin);
});
test.describe('[Admin View]', () => {
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/tests/e2e/12-settings.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.describe.skip('[Settings]', async () => {
sideNav = new SideNav(page);
userPreferences = new PreferencesMainContent(page);

await loginPage.goto('/');
await page.goto('/');
await loginPage.doLogin(validUserInserted);
await sideNav.general.click();
});
Expand Down Expand Up @@ -406,7 +406,7 @@ test.describe.skip('[Settings (admin)]', async () => {
sideNav = new SideNav(page);
admin = new Administration(page);

await loginPage.goto('/');
await page.goto('/');
await loginPage.doLogin(adminLogin);
await sideNav.general.click();
});
Expand Down Expand Up @@ -473,7 +473,7 @@ test.describe.skip('[Settings (admin)]', async () => {

test.describe('(UI) expect activate/deactivate flow as admin', () => {
test('expect open /users as admin', async () => {
await admin.goto('/admin');
await page.goto('/admin');
await admin.usersLink.click();
});

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/13-permissions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ test.describe('[Permissions]', () => {
test.describe('assert "userToBeCreated" permissions', () => {
test.beforeAll(async () => {
await sideNav.doLogout();
await loginPage.goto('/');
await page.goto('/');
await loginPage.doLogin(userToBeCreated);
await sideNav.general.click();
});
Expand Down
Loading

0 comments on commit d36fcdb

Please sign in to comment.