Merge pull request #27 from DEFRA/updates-to-login-work

Updates to login work
DEFRA · Dec 18, 2024 · 3d04f98 · 3d04f98
2 parents 7ce8428 + 203bffc
commit 3d04f98
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/test/page-objects/login-stub.page.js b/test/page-objects/login-stub.page.js
@@ -12,18 +12,22 @@ class LoginStubPage extends Page {
 
   async loginAsAdmin() {
     await super.login()
-    await this.onLoginStubsPage()
-    return await this.adminUserLink().click()
+    await expect(browser).toHaveTitle('CDP-Portal-Stubs - Login Stub')
+
+    const adminUserLink = this.adminUserLink()
+    await expect(adminUserLink).toExist()
+
+    await adminUserLink.click()
   }
 
   async loginAsNonAdmin() {
     await super.login()
-    await this.onLoginStubsPage()
-    return await this.nonAdminUserLink().click()
-  }
+    await expect(browser).toHaveTitle('CDP-Portal-Stubs - Login Stub')
+
+    const nonAdminUserLink = this.nonAdminUserLink()
+    await expect(nonAdminUserLink).toExist()
 
-  onLoginStubsPage() {
-    return expect(browser).toHaveTitle('CDP-Portal-Stubs - Login Stub')
+    await nonAdminUserLink.click()
   }
 }
 

diff --git a/test/specs/admin.e2e.js b/test/specs/admin.e2e.js
@@ -38,5 +38,9 @@ describe('Admin', () => {
       await expect(await AdminPage.navIsActive()).toBe(true)
       await expect(PageHeadingComponent.title('Users')).toExist()
     })
+
+    after(async () => {
+      await AdminPage.logOut()
+    })
   })
 })