Refactor

e2e/ui/Enterprise SSO/error.spec.ts

@@ -0,0 +1,32 @@
+import { test as baseTest, expect } from '@playwright/test';
+import { SSOPage } from 'e2e/support/fixtures';
+
+type MyFixtures = {
+  ssoPage: SSOPage;
+};
+
+export const test = baseTest.extend<MyFixtures>({
+  ssoPage: async ({ page, baseURL }, use, testInfo) => {
+    const ssoPage = new SSOPage(page);
+    const ssoName = `saml-${testInfo.workerIndex}`;
+    await ssoPage.goto();
+    await ssoPage.addSSOConnection({ name: ssoName, type: 'saml', baseURL: baseURL! });
+    await use(ssoPage);
+  },
+});
+
+test('OAuth2 wrapper + SAML provider + wrong redirectUrl', async ({ ssoPage, page, baseURL }, testInfo) => {
+  // check if the first added connection appears in the connection list
+  await expect(page.getByText(`saml-${testInfo.workerIndex}-1`)).toBeVisible();
+  await ssoPage.updateSSOConnection({
+    name: `saml-${testInfo.workerIndex}-1`,
+    url: 'https://invalid-url.com',
+  });
+  // Logout of magic link login
+  await ssoPage.logout();
+  await ssoPage.signInWithSSO();
+  // Wait for browser to redirect to error page
+  await page.waitForURL((url) => url.origin === baseURL && url.pathname === '/error');
+  // Assert error text
+  await expect(page.getByText(`SSO error: Redirect URL is not allowed.`)).toBeVisible();
+});

e2e/ui/Enterprise SSO/saml.spec.ts

@@ -4,7 +4,6 @@ import { Portal, SSOPage } from 'e2e/support/fixtures';
 type MyFixtures = {
   ssoPage: SSOPage;
   portal: Portal;
-  ssoPageWithoutDelete: SSOPage;
 };
 
 export const test = baseTest.extend<MyFixtures>({
@@ -20,13 +19,6 @@ export const test = baseTest.extend<MyFixtures>({
     const portal = new Portal(page);
     await use(portal);
   },
-  ssoPageWithoutDelete: async ({ page, baseURL }, use, testInfo) => {
-    const ssoPage = new SSOPage(page);
-    const ssoName = `saml-${testInfo.workerIndex}`;
-    await ssoPage.goto();
-    await ssoPage.addSSOConnection({ name: ssoName, type: 'saml', baseURL: baseURL! });
-    await use(ssoPage);
-  },
 });
 
 test('OAuth2 wrapper + SAML provider', async ({ ssoPage, portal, page, baseURL }, testInfo) => {
@@ -43,28 +35,6 @@ test('OAuth2 wrapper + SAML provider', async ({ ssoPage, portal, page, baseURL }
   await portal.isLoggedIn();
 });
 
-test('OAuth2 wrapper + SAML provider + wrong redirectUrl', async ({
-  ssoPageWithoutDelete,
-  page,
-  baseURL,
-}, testInfo) => {
-  // check if the first added connection appears in the connection list
-  await expect(page.getByText(`saml-${testInfo.workerIndex}-1`)).toBeVisible();
-  await ssoPageWithoutDelete.updateSSOConnection({
-    name: `saml-${testInfo.workerIndex}-1`,
-    url: 'https://invalid-url.com',
-  });
-  // Logout of magic link login
-  await ssoPageWithoutDelete.logout();
-  await ssoPageWithoutDelete.signInWithSSO();
-  // // Login using MockSAML
-  // await ssoPage.signInWithMockSAML();
-  // Wait for browser to redirect to error page
-  await page.waitForURL((url) => url.origin === baseURL && url.pathname === '/error');
-  // Assert error text
-  await expect(page.getByText(`SSO error: Redirect URL is not allowed.`)).toBeVisible();
-});
-
 test('OAuth2 wrapper + 2 SAML providers', async ({ ssoPage, portal, page, baseURL }, testInfo) => {
   const ssoName = `saml-${testInfo.workerIndex}`;
   // check if the first added connection appears in the connection list

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "jackson",
-  "version": "1.23.5",
+  "version": "1.23.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jackson",
-      "version": "1.23.5",
+      "version": "1.23.6",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jackson",
-  "version": "1.23.5",
+  "version": "1.23.6",
   "private": true,
   "description": "SAML 2.0 service",
   "keywords": [