Merge pull request #690 from Real-Dev-Squad/develop

Dev to main Sync

Author: iamitprakash

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

@@ -305,7 +305,7 @@ describe('Tests the Extension Requests Screen', () => {
         });
       } else if (
         url ===
-        'https://api.realdevsquad.com/logs/extensionRequests/?meta.extensionRequestId=fuQs71a0Y7BX3n4rc5Ii&dev=true'
+        'https://api.realdevsquad.com/logs/extensionRequests/?meta.extensionRequestId=fuQs71a0Y7BX3n4rc5Ii'
       ) {
         interceptedRequest.respond({
           status: 200,
@@ -319,7 +319,7 @@ describe('Tests the Extension Requests Screen', () => {
         });
       } else if (
         url ===
-        'https://api.realdevsquad.com/extension-requests/fuQs71a0Y7BX3n4rc5Ii?dev=true'
+        'https://api.realdevsquad.com/extension-requests/fuQs71a0Y7BX3n4rc5Ii'
       ) {
         interceptedRequest.respond({
           status: 200,
@@ -332,7 +332,7 @@ describe('Tests the Extension Requests Screen', () => {
         });
       } else if (
         url ===
-        'https://api.realdevsquad.com/logs/extensionRequests/?meta.extensionRequestId=lw7dRB0I3a6ivsFR5Izs&dev=true'
+        'https://api.realdevsquad.com/logs/extensionRequests/?meta.extensionRequestId=lw7dRB0I3a6ivsFR5Izs'
       ) {
         interceptedRequest.respond({
           status: 200,
@@ -771,54 +771,37 @@ describe('Tests the Extension Requests Screen', () => {
     expect(isTooltipVisible).toBe(true);
   });
   it('Validating audit logs for extension request', async () => {
-    // Visit extension request under dev flag
-    await page.goto('http://localhost:8000/extension-requests/?dev=true');
+    await page.goto('http://localhost:8000/extension-requests');
     const extensionRequestIds = [
       'log-container-fuQs71a0Y7BX3n4rc5Ii',
       'log-container-lw7dRB0I3a6ivsFR5Izs',
     ];
 
-    // Select all types of status of extension requests
     await page.click('#filter-button');
     await page.click('input[value="APPROVED"]');
     await page.click('input[value="DENIED"]');
     await page.click('#apply-filter-button');
     await page.waitForNetworkIdle();
 
-    // Checking if both the extension request cards are renedered or not
     const cardsList = await page.$$('.extension-card');
     expect(cardsList.length).toBe(2);
 
     const accordionButton = await page.$$('.accordion');
-    // Validate first extension card which is based on updated logs
     accordionButton[0].click();
     await page.waitForNetworkIdle();
     let extensionLogsForFirstER = await page.$(`#${extensionRequestIds[0]}`);
     let logs = await extensionLogsForFirstER.$$('.log-div');
     expect(Array.from(logs).length).toBe(6);
-    // Array.from(logs).forEach(async (log) => {
-    //   const innerText = await log.evaluate((element) => element.innerText);
-    //   expect(extensionRequestLogsInSentence[extensionRequestIds[0]]).toContain(
-    //     innerText,
-    //   );
-    // });
-
-    // Validating if it is backward compatible or not
+
     accordionButton[1].click();
     await page.waitForNetworkIdle();
     extensionLogsForFirstER = await page.$(`#${extensionRequestIds[1]}`);
     logs = await extensionLogsForFirstER.$$('.log-div');
     expect(Array.from(logs).length).toBe(1);
-    // Array.from(logs).forEach(async (log) => {
-    //   const innerText = await log.evaluate((element) => element.innerText);
-    //   expect(extensionRequestLogsInSentence[extensionRequestIds[1]]).toContain(
-    //     innerText,
-    //   );
-    // });
   });
 
   test('Checks the Request Number and request value element on Extension requests listing page', async () => {
-    const url = 'http://localhost:8000/extension-requests/?dev=true'; // Include the dev parameter in the URL
+    const url = 'http://localhost:8000/extension-requests';
     await page.goto(url);
 
     const extensionRequestNumberContainer = await page.$$(
@@ -834,7 +817,7 @@ describe('Tests the Extension Requests Screen', () => {
   });
 
   test('Default Request Number to 1 if requestNumber field is missing in API Response', async () => {
-    const url = 'http://localhost:8000/extension-requests/?dev=true'; // Include the dev parameter in the URL
+    const url = 'http://localhost:8000/extension-requests';
     await page.goto(url);
 
     const extensionRequestNumberContainer = await page.$$(
@@ -851,38 +834,32 @@ describe('Tests the Extension Requests Screen', () => {
   });
 
   it('Validating if audit logs are being generated in realtime', async () => {
-    // Visit extension request under dev flag
-    await page.goto('http://localhost:8000/extension-requests/?dev=true');
+    await page.goto('http://localhost:8000/extension-requests');
     const extensionRequestIds = [
       'log-container-fuQs71a0Y7BX3n4rc5Ii',
       'log-container-lw7dRB0I3a6ivsFR5Izs',
     ];
 
-    // Select all types of status of extension requests
     await page.click('#filter-button');
     await page.click('input[value="APPROVED"]');
     await page.click('input[value="DENIED"]');
     await page.click('#apply-filter-button');
     await page.waitForNetworkIdle();
 
-    // Checking if both the extension request cards are renedered or not
     const cardsList = await page.$$('.extension-card');
     expect(cardsList.length).toBe(2);
 
     const accordionButton = await page.$$('.accordion');
-    // Validate first extension card which is based on updated logs
     accordionButton[0].click();
     await page.waitForNetworkIdle();
     let extensionLogsForFirstER = await page.$(`#${extensionRequestIds[0]}`);
     let logs = await extensionLogsForFirstER.$$('.log-div');
 
-    // Click the first element with class '.edit-button'
     await page.$$eval('.edit-button', (buttons) => buttons[0].click());
     const newTitle = 'This is a new title test case';
     const newDate = '2024-09-19';
     const newReason = 'This is the new reason';
 
-    // Updating all the input fields
     await page.$$eval(
       '.title-text-input',
       (inputFields, newTitle) => (inputFields[0].value = newTitle),

__tests__/home/home.test.js

@@ -494,6 +494,22 @@ describe('Home Page', () => {
     expect(latestSyncStatusText).not.toBe(`Last Sync: In progress`);
   });
 
+  it('should display Applications button', async () => {
+    const applicationButton = await page.$('#application-button');
+    expect(applicationButton).toBeTruthy();
+    const applicationButtonHref = await page.evaluate(
+      (el) => el.getAttribute('href'),
+      applicationButton,
+    );
+    expect(applicationButtonHref).toBe('/applications');
+    const applicationButtonText = await page.evaluate(
+      (el) => el.innerText,
+      applicationButton,
+    );
+    const trimmedApplicationButtonText = applicationButtonText.trim();
+    expect(trimmedApplicationButtonText).toBe('Applications');
+  });
+
   it('should close hamburger menu on clicking anywhere on the screen except the menu', async () => {
     await page.setViewport({ width: 970, height: 1800 });
     await page.goto('http://localhost:8000/index.html');

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

@@ -3,8 +3,7 @@ const puppeteer = require('puppeteer');
 const { fetchedTaskRequests } = require('../../mock-data/taskRequests');
 
 const SITE_URL = 'http://localhost:8000';
-// helper/loadEnv.js file causes API_BASE_URL to be stagin-api on local env url in taskRequest/index.html
-const API_BASE_URL = 'https://staging-api.realdevsquad.com';
+const API_BASE_URL = 'https://api.realdevsquad.com';
 
 describe('Task Requests', () => {
   let browser;

__tests__/tasks/profile-picture.test.js

@@ -1,6 +1,6 @@
 const puppeteer = require('puppeteer');
-const API_BASE_URL = 'https://staging-api.realdevsquad.com';
 const { allUsersData } = require('../../mock-data/users');
+const API_BASE_URL = 'https://api.realdevsquad.com';
 
 describe('Task Page - Assignee Profile Pic', () => {
   let browser;

__tests__/users/App.test.js

@@ -1,6 +1,6 @@
 const puppeteer = require('puppeteer');
-const { API_BASE_URL } = require('../../constants');
 const { filteredUsersData } = require('../../mock-data/users');
+const API_BASE_URL = 'https://staging-api.realdevsquad.com';
 
 describe('App Component', () => {
   let browser;

applications/index.html

@@ -20,7 +20,7 @@ <h1>RDS Join Applications</h1>
 
         <img
           class="funnel-icon"
-          src="/taskRequests/assets/funnel.svg"
+          src="/task-requests/assets/funnel.svg"
           alt="funnel icon"
         />
       </button>

applications/script.js

@@ -84,6 +84,10 @@ function openApplicationDetails(application) {
     username: application.biodata.firstName,
     id: application.id,
     applicationDetails: [
+      {
+        title: 'Status',
+        description: application.status,
+      },
       {
         title: 'Introduction',
         description: application.intro.introduction,

applications/utils.js

@@ -1,4 +1,7 @@
-const BASE_URL = window.API_BASE_URL;
+const BASE_URL =
+  window.location.hostname === 'localhost'
+    ? 'https://staging-api.realdevsquad.com'
+    : window.API_BASE_URL;
 const toast = document.getElementById('toast');
 
 function createElement({ type, attributes = {}, innerText }) {

constants.js

@@ -1,4 +1,5 @@
-const API_BASE_URL = 'https://api.realdevsquad.com';
+const API_BASE_URL = window.API_BASE_URL || 'https://api.realdevsquad.com';
+('https://staging-sync.staging-realdevsquad-com.workers.dev');
 const REPO_SYNC_API_URL =
   'https://staging-sync.staging-realdevsquad-com.workers.dev';
 const USER_MANAGEMENT_LINK = 'user-management-link';

extension-requests/index.html

@@ -43,6 +43,7 @@ <h2>Status</h2>
       <div class="extension-requests"></div>
       <div class="virtual"></div>
     </div>
+    <script src="/helpers/loadENV.js"></script>
     <script src="/constants.js"></script>
     <script src="/extension-requests/constants.js"></script>
     <script src="/utils.js"></script>