Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhanced Angular UI unit test setup #6651

Merged
merged 13 commits into from
Dec 17, 2020
Merged

Enhanced Angular UI unit test setup #6651

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4745569
test: avoid error when localization doesn't exist in tests
armanozak Dec 15, 2020
4b5484b
test: extend test options from partial root options
armanozak Dec 15, 2020
2ced7cb
test: provide core options in forTest method
armanozak Dec 15, 2020
47c2fd4
Merge branch 'dev' of github.com:abpframework/abp into test/6648
armanozak Dec 15, 2020
b6608a4
test: add routes to core test module options
armanozak Dec 15, 2020
5d63bb3
test: add a secondary endpoint for testing module
armanozak Dec 15, 2020
8eef49e
test: add a mock localization pipe to core testing
armanozak Dec 15, 2020
e1dd342
test: add core testing module
armanozak Dec 15, 2020
549d8bc
build: add path to testing module endpoint
armanozak Dec 15, 2020
20fea08
refactor: remove testing core module
armanozak Dec 15, 2020
a9d081a
refactor: remove mock locaization pipe
armanozak Dec 15, 2020
47868ac
test: add public api to core testing module
armanozak Dec 15, 2020
4814ef7
test: use core testing module instead of core module
armanozak Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion npm/ng-packs/packages/core/src/lib/core.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,22 @@ export class TestCoreModule {}
providers: [LocalizationPipe],
})
export class CoreModule {
static forTest({ baseHref = '/' } = {} as ABP.Test): ModuleWithProviders<TestCoreModule> {
static forTest(
{ baseHref = '/', ...options } = {} as ABP.Test,
): ModuleWithProviders<TestCoreModule> {
return {
ngModule: TestCoreModule,
providers: [
{ provide: APP_BASE_HREF, useValue: baseHref },
{
provide: 'CORE_OPTIONS',
useValue: options,
},
{
provide: CORE_OPTIONS,
useFactory: coreOptionsFactory,
deps: ['CORE_OPTIONS'],
},
{
provide: LocalizationPipe,
useClass: MockLocalizationPipe,
Expand Down
2 changes: 1 addition & 1 deletion npm/ng-packs/packages/core/src/lib/models/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export namespace ABP {
sendNullsAsQueryParam?: boolean;
}

export interface Test {
export interface Test extends Partial<Root> {
baseHref?: Router;
}

Expand Down
3 changes: 2 additions & 1 deletion npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import snq from 'snq';
import { ApplicationLocalizationConfigurationDto } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models';

// This will not be necessary when only Angukar 9.1+ is supported
Expand All @@ -13,7 +14,7 @@ export function createLocalizer(localization: ApplicationLocalizationConfigurati
return (resourceName: string, key: string, defaultValue: string) => {
if (resourceName === '_') return key;

const resource = localization.values[resourceName];
const resource = snq(() => localization.values[resourceName]);

if (!resource) return defaultValue;

Expand Down