X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/dd315a23e98b926d4d15b9d05f1aaa1e211548a4..1d4e548cf6c8f11d939712ea5f4df06786a89d64:/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 8a17fe9f..83a699a7 100644 --- a/src/store/auth/auth-action.test.ts +++ b/src/store/auth/auth-action.test.ts @@ -9,7 +9,7 @@ import 'jest-localstorage-mock'; import { ServiceRepository, createServices } from "~/services/services"; import { configureStore, RootStore } from "../store"; import { createBrowserHistory } from "history"; -import { mockConfig } from '~/common/config'; +import { mockConfig, DISCOVERY_DOC_PATH, } from '~/common/config'; import { ApiActions } from "~/services/api/api-actions"; import { ACCOUNT_LINK_STATUS_KEY } from '~/services/link-account-service/link-account-service'; import Axios from "axios"; @@ -57,6 +57,20 @@ describe('auth-actions', () => { prefs: {} }); + axiosMock + .onGet("https://xc59z.arvadosapi.com/discovery/v1/apis/arvados/v1/rest") + .reply(200, { + baseUrl: "https://xc59z.arvadosapi.com/arvados/v1", + keepWebServiceUrl: "", + remoteHosts: {}, + rootUrl: "https://xc59z.arvadosapi.com", + uuidPrefix: "xc59z", + websocketUrl: "", + workbenchUrl: "", + workbench2Url: "", + revision: 12345678 + }); + importMocks.push(ImportMock.mockFunction(servicesModule, 'createServices', services)); // Only test the case when a link account operation is not being cancelled @@ -103,6 +117,12 @@ describe('auth-actions', () => { "rootUrl": "https://zzzzz.arvadosapi.com", "uuidPrefix": "zzzzz", }, + "xc59z": mockConfig({ + apiRevision: 12345678, + baseUrl: "https://xc59z.arvadosapi.com/arvados/v1", + rootUrl: "https://xc59z.arvadosapi.com", + uuidPrefix: "xc59z" + }) }, remoteHosts: { zzzzz: "zzzzz.arvadosapi.com", @@ -120,6 +140,7 @@ describe('auth-actions', () => { "name": "John Doe", "apiRevision": 12345678, "uuid": "zzzzz-tpzed-abcefg", + "userIsActive": true }, { "active": false, "baseUrl": "", @@ -156,22 +177,22 @@ describe('auth-actions', () => { // TODO: Add remaining action tests /* - it('should fire external url to login', () => { - const initialState = undefined; - window.location.assign = jest.fn(); - reducer(initialState, authActions.LOGIN()); - expect(window.location.assign).toBeCalledWith( - `/login?return_to=${window.location.protocol}//${window.location.host}/token` - ); - }); - - it('should fire external url to logout', () => { - const initialState = undefined; - window.location.assign = jest.fn(); - reducer(initialState, authActions.LOGOUT()); - expect(window.location.assign).toBeCalledWith( - `/logout?return_to=${location.protocol}//${location.host}` - ); - }); - */ + it('should fire external url to login', () => { + const initialState = undefined; + window.location.assign = jest.fn(); + reducer(initialState, authActions.LOGIN()); + expect(window.location.assign).toBeCalledWith( + `/login?return_to=${window.location.protocol}//${window.location.host}/token` + ); + }); + + it('should fire external url to logout', () => { + const initialState = undefined; + window.location.assign = jest.fn(); + reducer(initialState, authActions.LOGOUT()); + expect(window.location.assign).toBeCalledWith( + `/logout?return_to=${location.protocol}//${location.host}` + ); + }); + */ });