PUB-2365 - Fixed merge conflicts

Author: ChrisS1512

src/test/end-to-end/tests/custom-steps.ts

@@ -80,6 +80,7 @@ export = function () {
             this.usePlaywrightTo('Go to media login', async ({ page }) => {
                 page.goto(testConfig.TEST_URL + '/sign-in');
             });
+            this.waitForText('With a Court and tribunal hearings account');
             this.click('With a Court and tribunal hearings account');
             this.click('Continue');
             this.waitForText('Sign in with your email address');
@@ -93,6 +94,7 @@ export = function () {
             this.usePlaywrightTo('Go to media login', async ({ page }) => {
                 page.goto(testConfig.TEST_URL + '/sign-in');
             });
+            this.waitForText('With a Court and tribunal hearings account');
             this.click('With a Court and tribunal hearings account');
             this.click('Continue');
             this.waitForText('Sign in with your email address');
@@ -105,6 +107,7 @@ export = function () {
             this.usePlaywrightTo('Go to cft login', async ({ page }) => {
                 page.goto(testConfig.TEST_URL + '/sign-in');
             });
+            this.waitForText('With a MyHMCTS account');
             this.click('With a MyHMCTS account');
             this.click('Continue');
             this.waitForText('Sign in');
@@ -118,6 +121,7 @@ export = function () {
             this.usePlaywrightTo('Go to cft login', async ({ page }) => {
                 page.goto(testConfig.TEST_URL + '/sign-in');
             });
+            this.waitForText('With a MyHMCTS account');
             this.click('With a MyHMCTS account');
             this.click('Continue');
             this.waitForText('Sign in');
@@ -130,6 +134,7 @@ export = function () {
             this.usePlaywrightTo('Go to cft Welsh login', async ({ page }) => {
                 page.goto(testConfig.TEST_URL + '/sign-in');
             });
+            this.waitForText('With a MyHMCTS account');
             this.click('Cymraeg');
             this.click('Gyda chyfrif MyHMCTS');
             this.click('Parhau');

src/test/end-to-end/tests/login-test.ts

@@ -34,22 +34,20 @@ Scenario(
     }
 ).tag('@Nightly');
 
-Scenario.skip(
-    'I as a media user should be able to see the beta tag and feedback link when logging in',
-    async ({ I }) => {
-        I.usePlaywrightTo('Go to home page', async ({ page }) => {
-            page.goto(testConfig.TEST_URL + '/sign-in');
-        });
-        I.click('With a Court and tribunal hearings account');
-        I.click('Continue');
-        I.waitForText('Sign in with your email address');
-        I.seeBetaFeedbackOnPage('b2c/login');
-        I.executeScript('window.history.back();');
-        I.click('Forgot your password?');
-        I.waitForText('Please provide the following details.');
-        I.seeBetaFeedbackOnPage('b2c/reset-pw');
-    }
-);
+Scenario('I as a media user should be able to see the beta tag and feedback link when logging in', async ({ I }) => {
+    I.usePlaywrightTo('Go to home page', async ({ page }) => {
+        page.goto(testConfig.TEST_URL + '/sign-in');
+    });
+    I.waitForText('With a Court and tribunal hearings account');
+    I.click('With a Court and tribunal hearings account');
+    I.click('Continue');
+    I.waitForText('Sign in with your email address');
+    I.seeBetaFeedbackOnPage('b2c/login');
+    I.executeScript('window.history.back();');
+    I.click('Forgot your password?');
+    I.waitForText('Please provide the following details.');
+    I.seeBetaFeedbackOnPage('b2c/reset-pw');
+});
 
 Scenario('I as a CFT user should be able to sign-in with the valid credentials in English', async ({ I }) => {
     I.loginAsCftUser();

src/test/unit/modules/appinsights/appinsights.test.ts

@@ -0,0 +1,82 @@
+const mockTrackTrace = jest.fn();
+const mockSetSendLiveMetrics = jest.fn().mockReturnThis();
+const mockStart = jest.fn().mockReturnThis();
+
+jest.mock('applicationinsights', () => {
+    return {
+        setup: jest.fn(() => ({
+            setSendLiveMetrics: mockSetSendLiveMetrics,
+            start: mockStart,
+        })),
+        defaultClient: {
+            context: {
+                tags: {},
+                keys: {
+                    cloudRole: 'undefined-frontend',
+                },
+            },
+            trackTrace: mockTrackTrace,
+        },
+    };
+});
+
+import * as appInsights from 'applicationinsights';
+import { AppInsights } from '../../../../main/modules/appinsights';
+
+jest.mock('config', () => ({
+    get: jest.fn(() => {
+        return 'CONFIG_CONNECTION_STRING';
+    }),
+}));
+
+describe('App Insights', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        delete process.env.APP_INSIGHTS_CONNECTION_STRING;
+        appInsights.defaultClient.context.tags = {};
+    });
+
+    it('Uses environment variable for connection string', () => {
+        process.env.APP_INSIGHTS_CONNECTION_STRING = 'ENV_CONNECTION_STRING';
+        const appInsightsLibrary = new AppInsights();
+        appInsightsLibrary.enable();
+
+        expect(appInsights.setup).toHaveBeenCalledWith('ENV_CONNECTION_STRING');
+        expect(mockSetSendLiveMetrics).toHaveBeenCalledWith(true);
+        expect(mockStart).toHaveBeenCalled();
+        expect(appInsights.defaultClient.context.tags[appInsights.defaultClient.context.keys.cloudRole]).toBe(
+            'pip-frontend'
+        );
+        expect(mockTrackTrace).toHaveBeenCalledWith({ message: 'App insights activated' });
+    });
+
+    it('Uses config for connection string if env not set', () => {
+        const appInsightsLibrary = new AppInsights();
+        appInsightsLibrary.enable();
+
+        expect(appInsights.setup).toHaveBeenCalledWith('CONFIG_CONNECTION_STRING');
+        expect(mockSetSendLiveMetrics).toHaveBeenCalledWith(true);
+        expect(mockStart).toHaveBeenCalled();
+        expect(appInsights.defaultClient.context.tags[appInsights.defaultClient.context.keys.cloudRole]).toBe(
+            'pip-frontend'
+        );
+        expect(mockTrackTrace).toHaveBeenCalledWith({ message: 'App insights activated' });
+    });
+
+    it('Does nothing if no connection string is available', async () => {
+        jest.resetModules();
+        jest.doMock('config', () => ({
+            get: jest.fn(() => undefined),
+        }));
+        delete process.env.APP_INSIGHTS_CONNECTION_STRING;
+
+        const { AppInsights: AppInsightsNoConfig } = await import('../../../../main/modules/appinsights');
+        const appInsightsLibrary = new AppInsightsNoConfig();
+        appInsightsLibrary.enable();
+
+        expect(appInsights.setup).not.toHaveBeenCalled();
+        expect(mockSetSendLiveMetrics).not.toHaveBeenCalled();
+        expect(mockStart).not.toHaveBeenCalled();
+        expect(mockTrackTrace).not.toHaveBeenCalled();
+    });
+});

src/test/unit/requests/dataManagementRequests.test.ts

@@ -13,6 +13,12 @@ const errorMessage = {
     message: 'test',
 };
 
+const errorResponseWithStatusButNoText = {
+    response: {
+        status: 400,
+    },
+};
+
 const errorResponseWithUiErrorText = {
     response: {
         status: 400,
@@ -285,5 +291,20 @@ describe('Data Management requests', () => {
             });
             expect(await fileUploadAPI.uploadLocationFile({ file: '', fileName: 'baz' })).toBeFalsy();
         });
+
+        it('should return false when error response text is not present', async () => {
+            sinon.stub(superagent, 'post').callsFake(() => {
+                return {
+                    set(): any {
+                        return {
+                            set(): any {
+                                return { attach: sinon.stub().rejects(errorResponseWithStatusButNoText) };
+                            },
+                        };
+                    },
+                };
+            });
+            expect(await fileUploadAPI.uploadLocationFile({ file: '', fileName: 'baz' })).toBeFalsy();
+        });
     });
 });