chore: upgrade deps

changelog fix unit test update jest config OKTA-406686 <<<Jenkins Check-In of Tested SHA: 899d824 for [email protected]>>> Artifact: okta-vue Files changed count: 4 PR Link: "#68"
okta · Jun 23, 2021 · a2319d9 · a2319d9
1 parent a3599f6
commit a2319d9
Show file tree

Hide file tree

Showing 4 changed files with 2,233 additions and 2,045 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@
   - Removed `isPending` from `AuthState`
   - Default value for `originalUri` is null
 
+### Others
+
+- [#68](https://github.com/okta/okta-vue/pull/68) Upgrades dependencies
+
 # 4.0.1
 
 ### Bug Fixes

diff --git a/jest.config.js b/jest.config.js
@@ -35,8 +35,5 @@ module.exports = {
     '^.+\\.jsx?$': 'babel-jest',
     '.*\\.(vue)$': 'vue-jest'
   },
-  moduleNameMapper: {
-    '^@okta/okta-auth-js$': '<rootDir>/node_modules/@okta/okta-auth-js/dist/okta-auth-js.umd.js'
-  },
   testEnvironment: 'jsdom'
 }
diff --git a/test/specs/LoginCallback.spec.js b/test/specs/LoginCallback.spec.js
@@ -36,15 +36,7 @@ describe('LoginCallback', () => {
 
   async function navigateToCallback (options = {}) {
     jest.spyOn(oktaAuth, 'isLoginRedirect').mockReturnValue(options.isLoginRedirect)
-    jest.spyOn(oktaAuth, 'storeTokensFromRedirect').mockImplementation(() => {
-      return new Promise(resolve => {
-        if (oktaAuth.isLoginRedirect()) {
-          oktaAuth.emitter.emit('authStateChange', { })
-        }
-        resolve()
-      })
-    })
-    oktaAuth.options.restoreOriginalUri = jest.fn()
+    jest.spyOn(oktaAuth, 'storeTokensFromRedirect').mockResolvedValue(undefined)
     const router = createRouter({
       history: createWebHistory(),
       routes: [
@@ -60,17 +52,15 @@ describe('LoginCallback', () => {
         ]
       }
     })
-
+    
     router.push('/')
     await router.isReady()
-    await nextTick() // let promise from handleLoginRedirect resolve
   }
 
   it('renders the component', async () => {
     createOktaAuth()
     jest.spyOn(LoginCallback, 'render')
     await navigateToCallback()
-    await 
     expect(LoginCallback.render).toHaveBeenCalled()
     expect(wrapper.text()).toBe('')
   })
@@ -85,12 +75,18 @@ describe('LoginCallback', () => {
   it('calls the default "restoreOriginalUri" options when in login redirect uri', async () => {
     createOktaAuth()
     await navigateToCallback({ isLoginRedirect: true })
+    jest.spyOn(oktaAuth.options, 'restoreOriginalUri')
+    // nextTick only wait on dom updates, explicitly wait for the next event loop happen as no dom update here
+    await new Promise(resolve => setTimeout(resolve))
     expect(oktaAuth.options.restoreOriginalUri).toHaveBeenCalled()
   })
 
   it('should not call the default "restoreOriginalUri" options when not in login redirect uri', async () => {
     createOktaAuth()
     await navigateToCallback({ isLoginRedirect: false })
+    jest.spyOn(oktaAuth.options, 'restoreOriginalUri');
+    // nextTick only wait on dom updates, explicitly wait for the next event loop happen as no dom update here
+    await new Promise(resolve => setTimeout(resolve))
     expect(oktaAuth.options.restoreOriginalUri).not.toHaveBeenCalled()
   })