Merge pull request #7095 from abpframework/auto-merge/rel-4-1/56

Merge branch dev with rel-4.1
pull/7128/head
Halil İbrahim Kalkan 5 years ago committed by GitHub
commit acaac1d406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,8 +1,8 @@
import {
ABP,
BaseCoreModule,
CORE_OPTIONS,
coreOptionsFactory,
CORE_OPTIONS,
LIST_QUERY_DEBOUNCE_TIME,
LOADER_DELAY,
PermissionService,
@ -34,7 +34,10 @@ export class CoreTestingModule {
{ provide: APP_BASE_HREF, useValue: baseHref },
{
provide: 'CORE_OPTIONS',
useValue: options,
useValue: {
skipGetAppConfiguration: true,
...options,
},
},
{
provide: CORE_OPTIONS,

Loading…
Cancel
Save