Merge pull request #16126 from abpframework/auto-merge/rel-7-0/1837

Merge branch rel-7.1 with rel-7.0

templates/app-nolayers/angular/src/app/home/home.component.spec.ts

@@ -1,5 +1,4 @@
 import { CoreTestingModule } from '@abp/ng.core/testing';
-import { ThemeBasicTestingModule } from '@abp/ng.theme.basic/testing';
 import { ThemeSharedTestingModule } from '@abp/ng.theme.shared/testing';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
@@ -17,7 +16,6 @@ describe('HomeComponent', () => {
       imports: [
         CoreTestingModule.withConfig(),
         ThemeSharedTestingModule.withConfig(),
-        ThemeBasicTestingModule.withConfig(),
         NgxValidateCoreModule,
       ],
       providers: [

templates/app/angular/src/app/home/home.component.spec.ts

@@ -1,5 +1,4 @@
 import { CoreTestingModule } from "@abp/ng.core/testing";
-import { ThemeBasicTestingModule } from "@abp/ng.theme.basic/testing";
 import { ThemeSharedTestingModule } from "@abp/ng.theme.shared/testing";
 import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
 import { NgxValidateCoreModule } from "@ngx-validate/core";
@@ -8,6 +7,7 @@ import { OAuthService } from 'angular-oauth2-oidc';
 import { AuthService } from '@abp/ng.core';
 
 
+
 describe("HomeComponent", () => {
   let fixture: ComponentFixture<HomeComponent>;
   const mockOAuthService = jasmine.createSpyObj('OAuthService', ['hasValidAccessToken'])
@@ -19,7 +19,6 @@ describe("HomeComponent", () => {
         imports: [
           CoreTestingModule.withConfig(),
           ThemeSharedTestingModule.withConfig(),
-          ThemeBasicTestingModule.withConfig(),
           NgxValidateCoreModule,
         ],
         providers: [
@@ -97,4 +96,4 @@ describe("HomeComponent", () => {
     })
   })
 
-});
+});