test(e2e): resolve regressions

ory · Oct 22, 2021 · aaff34e · aaff34e
1 parent 0a8b40b
commit aaff34e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/test/e2e/cypress/integration/profiles/mfa/lookup.spec.ts b/test/e2e/cypress/integration/profiles/mfa/lookup.spec.ts
@@ -1,6 +1,6 @@
-import {appPrefix, gen, website} from '../../../helpers'
-import {routes as express} from '../../../helpers/express'
-import {routes as react} from '../../../helpers/react'
+import { appPrefix, gen, website } from '../../../helpers'
+import { routes as express } from '../../../helpers/express'
+import { routes as react } from '../../../helpers/react'
 
 context('2FA lookup secrets', () => {
   ;[
@@ -18,7 +18,7 @@ context('2FA lookup secrets', () => {
       app: 'express' as 'express',
       profile: 'mfa'
     }
-  ].forEach(({settings, login, profile, app, base}) => {
+  ].forEach(({ settings, login, profile, app, base }) => {
     describe(`for app ${app}`, () => {
       before(() => {
         cy.useConfigProfile(profile)
@@ -36,9 +36,9 @@ context('2FA lookup secrets', () => {
         cy.registerApi({
           email,
           password,
-          fields: {'traits.website': website}
+          fields: { 'traits.website': website }
         })
-        cy.login({email, password, cookieUrl: base})
+        cy.login({ email, password, cookieUrl: base })
 
         cy.longPrivilegedSessionTime()
         cy.sessionRequiresNo2fa()
@@ -58,13 +58,13 @@ context('2FA lookup secrets', () => {
         cy.shortPrivilegedSessionTime()
         cy.get('button[name="lookup_secret_disable"]').click()
         cy.reauth({
-          expect: {email},
-          type: {email: email, password: password}
+          expect: { email },
+          type: { email: email, password: password }
         })
         cy.expectSettingsSaved()
 
         cy.clearAllCookies()
-        cy.login({email: email, password: password, cookieUrl: base})
+        cy.login({ email: email, password: password, cookieUrl: base })
 
         cy.visit(login + '?aal=aal2')
         cy.get('h2').should('contain.text', 'Two-Factor Authentication')
@@ -242,8 +242,8 @@ context('2FA lookup secrets', () => {
         cy.visit(settings)
         cy.get('button[name="lookup_secret_regenerate"]').click()
         cy.reauth({
-          expect: {email},
-          type: {email: email, password: password}
+          expect: { email },
+          type: { email: email, password: password }
         })
 
         let codes
@@ -254,22 +254,22 @@ context('2FA lookup secrets', () => {
         cy.shortPrivilegedSessionTime()
         cy.get('button[name="lookup_secret_confirm"]').click()
         cy.reauth({
-          expect: {email},
-          type: {email: email, password: password}
+          expect: { email },
+          type: { email: email, password: password }
         })
         cy.expectSettingsSaved()
 
         cy.shortPrivilegedSessionTime()
         cy.get('button[name="lookup_secret_reveal"]').click()
         cy.reauth({
-          expect: {email},
-          type: {email: email, password: password}
+          expect: { email },
+          type: { email: email, password: password }
         })
         cy.getLookupSecrets().should((c) => {
           expect(c).to.not.be.empty
         })
         cy.getSession({
-          expectAal: 'aal2',
+          expectAal: 'aal2'
         })
       })
 

diff --git a/test/e2e/cypress/integration/profiles/mfa/totp.spec.ts b/test/e2e/cypress/integration/profiles/mfa/totp.spec.ts
@@ -80,15 +80,17 @@ context('2FA lookup secrets', () => {
         // If we visit settings page we still end up at 2fa screen
         cy.visit(settings)
         cy.location().should((loc) => {
-          expect(loc.href).to.include('/login')
+          expect(loc.pathname).to.include('/login')
         })
 
         cy.shouldShow2FAScreen()
         cy.get('input[name="totp_code"]').then(($e) => {
           cy.wrap($e).type(authenticator.generate(secret))
         })
         cy.get('*[name="method"][value="totp"]').click()
-        cy.expectSettingsSaved()
+        cy.location().should((loc) => {
+          expect(loc.pathname).to.oneOf(['/welcome', '/'])
+        })
         cy.getSession({
           expectAal: 'aal2',
           expectMethods: ['password', 'totp']

diff --git a/test/e2e/cypress/support/index.d.ts b/test/e2e/cypress/support/index.d.ts
@@ -24,7 +24,9 @@ declare global {
        */
       getSession(opts?: {
         expectAal?: 'aal2' | 'aal1'
-        expectMethods?: Array<'password' | 'webauthn' | 'lookup_secret' | 'totp'>
+        expectMethods?: Array<
+          'password' | 'webauthn' | 'lookup_secret' | 'totp'
+        >
       }): Chainable<Session>
 
       /**