Skip to content

Commit a3bf062

Browse files
iamitprakashiamitprakash
authored
Merge pull request #779 from Real-Dev-Squad/develop
develop to main sync
2 parents 2bd7f5c + 5bdead1 commit a3bf062

File tree

26 files changed

+652
-426
lines changed

26 files changed

+652
-426
lines changed

‎__tests__/extension-requests/extension-requests.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ describe('Tests the Extension Requests Screen', () => {
401401
await browser.close();
402402
});
403403
it('Checks the UI elements on Extension requests listing page', async () => {
404-
title = await page.$('.header h1');
404+
title = await page.$('#pageTitle');
405405
searchBar = await page.$('#search');
406406
filterButton = await page.$('#filter-button');
407407
extensionCardsList = await page.$$('.extension-card');
@@ -462,7 +462,7 @@ describe('Tests the Extension Requests Screen', () => {
462462
expect(await modal.evaluate((el) => el.classList.contains('hidden'))).toBe(
463463
false,
464464
);
465-
await page.click('#filter-button');
465+
await page.evaluate(() => document.querySelector('#filter-button').click());
466466
expect(await modal.evaluate((el) => el.classList.contains('hidden'))).toBe(
467467
true,
468468
);

‎__tests__/home/home.test.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,8 @@ describe('Home Page', () => {
447447
},
448448
];
449449

450+
await page.waitForTimeout(1500);
451+
450452
const userName = await page.$eval(
451453
'#user-name',
452454
(element) => element.textContent,

‎__tests__/navbar/navbar.test.js‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
const puppeteer = require('puppeteer');
2+
3+
const baseUrl = 'http://localhost:8000';
4+
describe('Tests the navbar and its components on various pages', () => {
5+
let browser;
6+
let page;
7+
jest.setTimeout(60000);
8+
9+
const testNavbar = async (navbarPage) => {
10+
const navbar = await navbarPage.$('#tasksNav');
11+
expect(navbar).toBeTruthy();
12+
13+
const rdsLogo = await navbarPage.$('.logo');
14+
expect(rdsLogo).toBeTruthy();
15+
16+
const navLinks = await navbarPage.$('.nav-links');
17+
expect(navLinks).toBeTruthy();
18+
};
19+
20+
beforeAll(async () => {
21+
browser = await puppeteer.launch({
22+
headless: 'new',
23+
ignoreHTTPSErrors: true,
24+
args: ['--incognito', '--disable-web-security'],
25+
devtools: false,
26+
});
27+
});
28+
29+
beforeEach(async () => {
30+
page = await browser.newPage();
31+
});
32+
33+
afterEach(async () => {
34+
await page.close();
35+
});
36+
37+
afterAll(async () => {
38+
await browser.close();
39+
});
40+
41+
it('Renders the navbar correctly on the home page', async () => {
42+
await page.goto(`${baseUrl}`);
43+
await testNavbar(page);
44+
});
45+
46+
it('Renders the navbar correctly on the tasks page', async () => {
47+
await page.goto(`${baseUrl}/task`);
48+
await testNavbar(page);
49+
});
50+
51+
it('Renders the navbar correctly on the profile page', async () => {
52+
await page.goto(`${baseUrl}/profile`);
53+
await testNavbar(page);
54+
});
55+
56+
it('Renders the navbar correctly on the Discord users page', async () => {
57+
await page.goto(`${baseUrl}/users/discord`);
58+
await testNavbar(page);
59+
});
60+
61+
it('Renders the navbar correctly on the User Management page', async () => {
62+
await page.goto(`${baseUrl}/users`);
63+
await testNavbar(page);
64+
});
65+
66+
it('Renders the navbar correctly on the Extension Requests page', async () => {
67+
await page.goto(`${baseUrl}/extension-requests`);
68+
await testNavbar(page);
69+
});
70+
71+
it('Renders the navbar correctly on the Task Requests page', async () => {
72+
await page.goto(`${baseUrl}/task-requests`);
73+
await testNavbar(page);
74+
});
75+
76+
it('Renders the navbar correctly on the Online Members page', async () => {
77+
await page.goto(`${baseUrl}/online-members/online-members.html`);
78+
await testNavbar(page);
79+
});
80+
81+
it('Renders the navbar correctly on the Standup Updates page', async () => {
82+
await page.goto(`${baseUrl}/standup/index.html`);
83+
await testNavbar(page);
84+
});
85+
86+
it('Renders the navbar correctly on the Identity Service Logs page', async () => {
87+
await page.goto(`${baseUrl}/identity-service-logs/index.html`);
88+
await testNavbar(page);
89+
});
90+
91+
it('Renders the navbar correctly on the Requests page', async () => {
92+
await page.goto(`${baseUrl}/requests/index.html`);
93+
await testNavbar(page);
94+
});
95+
96+
it('Renders the navbar correctly on the Activity Feed page', async () => {
97+
await page.goto(`${baseUrl}/feed/index.html`);
98+
await testNavbar(page);
99+
});
100+
});

‎__tests__/task-requests/task-request.test.js‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,11 +359,29 @@ describe('urlParams', () => {
359359
});
360360

361361
describe('Sort Icon Functionality', () => {
362+
let browser;
363+
let page;
364+
365+
beforeAll(async () => {
366+
browser = await puppeteer.launch({
367+
headless: 'new',
368+
ignoreHTTPSErrors: true,
369+
args: ['--incognito', '--disable-web-security'],
370+
devtools: false,
371+
});
372+
373+
page = await browser.newPage();
374+
});
375+
362376
beforeEach(async () => {
363377
await page.goto(`${SITE_URL}/task-requests/?dev=true`);
364378
await page.waitForNetworkIdle();
365379
});
366380

381+
afterAll(async () => {
382+
await browser.close();
383+
});
384+
367385
const getSortIconDetails = async (iconId) => {
368386
const iconElement = await page.$(`#${iconId}`);
369387
const display = await page.evaluate(
@@ -420,18 +438,36 @@ describe('Sort Icon Functionality', () => {
420438
describe('badges', () => {
421439
const DENIED = 'DENIED';
422440
const ASSIGNMENT = 'assignment';
441+
let browser;
442+
let page;
423443

424444
const getBadgeTexts = async (page) => {
425445
const badges = await page.$$('.badge');
426446
return Promise.all(
427447
badges.map((badge) => page.evaluate((el) => el.textContent, badge)),
428448
);
429449
};
450+
451+
beforeAll(async () => {
452+
browser = await puppeteer.launch({
453+
headless: 'new',
454+
ignoreHTTPSErrors: true,
455+
args: ['--incognito', '--disable-web-security'],
456+
devtools: false,
457+
});
458+
459+
page = await browser.newPage();
460+
});
461+
430462
beforeEach(async () => {
431463
await page.goto(`${SITE_URL}/task-requests/?dev=true`);
432464
await page.waitForNetworkIdle();
433465
});
434466

467+
afterAll(async () => {
468+
await browser.close();
469+
});
470+
435471
it('verifies that filters applied by the user are correctly displayed as badges on the screen', async () => {
436472
await page.click('#filter-button');
437473
await page.click(`input[value="${DENIED}"]`);

‎__tests__/users/onboarding-31-days-multiple-selections.test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const puppeteer = require('puppeteer');
2+
const { superUserDetails } = require('../../mock-data/users/mockdata');
23

34
describe('Tests the "Onboarding > 31 Days" Filter', () => {
45
let browser;

‎__tests__/users/onboarding31days.test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const puppeteer = require('puppeteer');
2+
const { superUserDetails } = require('../../mock-data/users/mockdata');
23

34
describe('Tests the "Onboarding > 31 Days" Filter', () => {
45
let browser;

‎extension-requests/index.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
<head>
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<link rel="stylesheet" href="/global.css" />
67
<link rel="stylesheet" href="/extension-requests/style.css" />
78
<title>Extension Requests</title>
9+
<script src="/navbar.global.js" async></script>
10+
<script src="/userLogin.js" async></script>
811
</head>
912

1013
<body>
11-
<header class="header">
12-
<h1>Extension Requests</h1>
13-
</header>
14-
14+
<nav id="tasksNav"></nav>
15+
<h1 id="pageTitle">Extension Requests</h1>
1516
<div class="search-filter">
1617
<div id="search">
1718
<input id="assignee-search" type="text" placeholder="Enter usernames" />

‎feed/index.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
<meta charset="UTF-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<link rel="stylesheet" href="/global.css" />
78
<link rel="stylesheet" href="/feed/style.css" />
89
<link rel="stylesheet" href="/style.css" />
910
<title>Activity Feed | Real Dev Squad</title>
11+
<script src="/navbar.global.js" async></script>
12+
<script src="/userLogin.js" async></script>
1013
<script src="/helpers/loadENV.js"></script>
1114
<script src="/feed/constants.js"></script>
1215
<script src="/constants.js"></script>
@@ -15,9 +18,8 @@
1518
<script src="/feed/script.js" defer></script>
1619
</head>
1720
<body>
18-
<header class="header">
19-
<h1>Activity Feed</h1>
20-
</header>
21+
<nav id="tasksNav"></nav>
22+
<h1 id="pageTitle">Activity Feed</h1>
2123
<nav class="tabs-container">
2224
<ul class="tabs"></ul>
2325
<div class="container">

0 commit comments

Comments
 (0)