X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e1605f7c93aeb41ae31e0dd88a9afd8709136b62..04446cedce14583b0ad11f6f0d989bf834a27d04:/src/store/auth/auth-action.test.ts

diff --git a/src/store/auth/auth-action.test.ts b/src/store/auth/auth-action.test.ts
index e5775a493d..1ebc8db993 100644
--- a/src/store/auth/auth-action.test.ts
+++ b/src/store/auth/auth-action.test.ts
@@ -11,22 +11,26 @@ import {
     USER_LAST_NAME_KEY,
     USER_OWNER_UUID_KEY,
     USER_UUID_KEY,
-    USER_IS_ADMIN, USER_IDENTITY_URL, USER_PREFS
+    USER_IS_ADMIN,
+    USER_IS_ACTIVE,
+    USER_USERNAME,
+    USER_PREFS
 } from "~/services/auth-service/auth-service";
 
 import 'jest-localstorage-mock';
 import { createServices } from "~/services/services";
 import { configureStore, RootStore } from "../store";
 import createBrowserHistory from "history/createBrowserHistory";
-import { Config, mockConfig } from '~/common/config';
+import { mockConfig } from '~/common/config';
 import { ApiActions } from "~/services/api/api-actions";
+import { ACCOUNT_LINK_STATUS_KEY} from '~/services/link-account-service/link-account-service';
 
 describe('auth-actions', () => {
     let reducer: (state: AuthState | undefined, action: AuthAction) => any;
     let store: RootStore;
     const actions: ApiActions = {
-        progressFn: (id: string, working: boolean) => {},
-        errorFn: (id: string, message: string) => {}
+        progressFn: (id: string, working: boolean) => { },
+        errorFn: (id: string, message: string) => { }
     };
 
     beforeEach(() => {
@@ -37,18 +41,23 @@ describe('auth-actions', () => {
 
     it('should initialise state with user and api token from local storage', () => {
 
+        // Only test the case when a link account operation is not being cancelled
+        sessionStorage.setItem(ACCOUNT_LINK_STATUS_KEY, "0");
         localStorage.setItem(API_TOKEN_KEY, "token");
         localStorage.setItem(USER_EMAIL_KEY, "test@test.com");
         localStorage.setItem(USER_FIRST_NAME_KEY, "John");
         localStorage.setItem(USER_LAST_NAME_KEY, "Doe");
-        localStorage.setItem(USER_UUID_KEY, "uuid");
-        localStorage.setItem(USER_IDENTITY_URL, "identityUrl");
+        localStorage.setItem(USER_UUID_KEY, "zzzzz-tpzed-abcefg");
+        localStorage.setItem(USER_USERNAME, "username");
         localStorage.setItem(USER_PREFS, JSON.stringify({}));
         localStorage.setItem(USER_OWNER_UUID_KEY, "ownerUuid");
-        localStorage.setItem(USER_IS_ADMIN, JSON.stringify("false"));
+        localStorage.setItem(USER_IS_ADMIN, JSON.stringify(false));
+        localStorage.setItem(USER_IS_ACTIVE, JSON.stringify(true));
 
         const config: any = {
-            remoteHosts: { "xc59": "xc59.api.arvados.com" }
+            rootUrl: "https://zzzzz.arvadosapi.com",
+            uuidPrefix: "zzzzz",
+            remoteHosts: { xc59z: "xc59z.arvadosapi.com" },
         };
 
         store.dispatch(initAuth(config));
@@ -56,23 +65,30 @@ describe('auth-actions', () => {
         expect(store.getState().auth).toEqual({
             apiToken: "token",
             sshKeys: [],
+            homeCluster: "zzzzz",
+            localCluster: "zzzzz",
+            remoteHostsConfig: {},
+            remoteHosts: {
+                zzzzz: "zzzzz.arvadosapi.com",
+                xc59z: "xc59z.arvadosapi.com"
+            },
             sessions: [{
                 "active": true,
                 "baseUrl": undefined,
-                "clusterId": undefined,
+                "clusterId": "zzzzz",
                 "email": "test@test.com",
                 "loggedIn": true,
-                "remoteHost": undefined,
+                "remoteHost": "https://zzzzz.arvadosapi.com",
                 "status": 2,
                 "token": "token",
                 "username": "John Doe"
             }, {
                 "active": false,
                 "baseUrl": "",
-                "clusterId": "xc59",
+                "clusterId": "xc59z",
                 "email": "",
                 "loggedIn": false,
-                "remoteHost": "xc59.api.arvados.com",
+                "remoteHost": "xc59z.arvadosapi.com",
                 "status": 0,
                 "token": "",
                 "username": ""
@@ -81,11 +97,12 @@ describe('auth-actions', () => {
                 email: "test@test.com",
                 firstName: "John",
                 lastName: "Doe",
-                uuid: "uuid",
+                uuid: "zzzzz-tpzed-abcefg",
                 ownerUuid: "ownerUuid",
-                identityUrl: "identityUrl",
+                username: "username",
                 prefs: {},
-                isAdmin: false
+                isAdmin: false,
+                isActive: true
             }
         });
     });
@@ -111,5 +128,3 @@ describe('auth-actions', () => {
     });
     */
 });
-
-