Browse Source

test: fix testing error

pull/4995/head
mehmet-erim 6 years ago
parent
commit
ede9dc9b8c
  1. 6
      npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts
  2. 2
      npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts

6
npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts

@ -6,9 +6,8 @@ import { of } from 'rxjs';
import { GetAppConfiguration } from '../actions'; import { GetAppConfiguration } from '../actions';
import { CORE_OPTIONS } from '../tokens/options.token'; import { CORE_OPTIONS } from '../tokens/options.token';
import { checkAccessToken, getInitialData, localeInitializer } from '../utils'; import { checkAccessToken, getInitialData, localeInitializer } from '../utils';
import * as multiTenancyUtils from '../utils/multi-tenancy-utils';
import * as environmentUtils from '../utils/environment-utils'; import * as environmentUtils from '../utils/environment-utils';
import { OAUTH_STRATEGY } from '../strategies/oauth.strategy'; import * as multiTenancyUtils from '../utils/multi-tenancy-utils';
@Component({ @Component({
selector: 'abp-dummy', selector: 'abp-dummy',
@ -36,15 +35,14 @@ describe('InitialUtils', () => {
const dispatchSpy = jest.spyOn(store, 'dispatch'); const dispatchSpy = jest.spyOn(store, 'dispatch');
const parseTenantFromUrlSpy = jest.spyOn(multiTenancyUtils, 'parseTenantFromUrl'); const parseTenantFromUrlSpy = jest.spyOn(multiTenancyUtils, 'parseTenantFromUrl');
const getRemoteEnvSpy = jest.spyOn(environmentUtils, 'getRemoteEnv'); const getRemoteEnvSpy = jest.spyOn(environmentUtils, 'getRemoteEnv');
const initOAuthSpy = jest.spyOn(OAUTH_STRATEGY, 'Init');
parseTenantFromUrlSpy.mockReturnValue(Promise.resolve()); parseTenantFromUrlSpy.mockReturnValue(Promise.resolve());
getRemoteEnvSpy.mockReturnValue(Promise.resolve()); getRemoteEnvSpy.mockReturnValue(Promise.resolve());
injectorSpy.mockReturnValueOnce(store); injectorSpy.mockReturnValueOnce(store);
injectorSpy.mockReturnValueOnce({ skipGetAppConfiguration: false }); injectorSpy.mockReturnValueOnce({ skipGetAppConfiguration: false });
injectorSpy.mockReturnValueOnce({ init: () => null });
injectorSpy.mockReturnValueOnce({ hasValidAccessToken: () => false }); injectorSpy.mockReturnValueOnce({ hasValidAccessToken: () => false });
dispatchSpy.mockReturnValue(of('test')); dispatchSpy.mockReturnValue(of('test'));
initOAuthSpy.mockReturnValue(Promise.resolve());
expect(typeof getInitialData(injector)).toBe('function'); expect(typeof getInitialData(injector)).toBe('function');
expect(await getInitialData(injector)()).toBe('test'); expect(await getInitialData(injector)()).toBe('test');

2
npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts

@ -5,11 +5,11 @@ import { OAuthService } from 'angular-oauth2-oidc';
import { tap } from 'rxjs/operators'; import { tap } from 'rxjs/operators';
import { GetAppConfiguration } from '../actions/config.actions'; import { GetAppConfiguration } from '../actions/config.actions';
import { ABP } from '../models/common'; import { ABP } from '../models/common';
import { AuthService } from '../services/auth.service';
import { ConfigState } from '../states/config.state'; import { ConfigState } from '../states/config.state';
import { CORE_OPTIONS } from '../tokens/options.token'; import { CORE_OPTIONS } from '../tokens/options.token';
import { getRemoteEnv } from './environment-utils'; import { getRemoteEnv } from './environment-utils';
import { parseTenantFromUrl } from './multi-tenancy-utils'; import { parseTenantFromUrl } from './multi-tenancy-utils';
import { AuthService } from '../services/auth.service';
export function getInitialData(injector: Injector) { export function getInitialData(injector: Injector) {
const fn = async () => { const fn = async () => {

Loading…
Cancel
Save