Merge branch 'staging' into l10n_staging

altair-graphql · Nov 10, 2019 · 0473474 · 0473474
2 parents 9ac83d3 + 7b96c30
commit 0473474
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/src/app/components/settings-dialog/settings-dialog.component.spec.ts b/src/app/components/settings-dialog/settings-dialog.component.spec.ts
@@ -7,13 +7,14 @@ import { CodemirrorModule } from '@ctrl/ngx-codemirror';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { SettingsDialogComponent } from './settings-dialog.component';
-import { NotifyService, KeybinderService, WindowService, DbService, ElectronAppService, StorageService } from 'app/services';
+import { NotifyService, KeybinderService, WindowService, DbService, ElectronAppService, StorageService, GqlService } from 'app/services';
 import { ToastrModule } from 'ngx-toastr';
 import { Store } from '@ngrx/store';
 import { ElectronService } from 'ngx-electron';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { SharedModule } from 'app/shared/shared.module';
 import { SchemaFormModule } from '../schema-form/schema-form.module';
+import { HttpClientModule } from '@angular/common/http';
 
 describe('SettingsDialogComponent', () => {
   let component: SettingsDialogComponent;
@@ -23,6 +24,7 @@ describe('SettingsDialogComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ SettingsDialogComponent ],
       imports: [
+        HttpClientModule,
         BrowserAnimationsModule,
         FormsModule,
         CodemirrorModule,
@@ -39,6 +41,7 @@ describe('SettingsDialogComponent', () => {
         ElectronAppService,
         ElectronService,
         StorageService,
+        GqlService,
         {
           provide: Store, useValue: {
             subscribe: () => { },

diff --git a/src/app/containers/app/app.component.spec.ts b/src/app/containers/app/app.component.spec.ts
@@ -35,6 +35,7 @@ describe('AppComponent', () => {
       services.NotifyService,
       services.StorageService,
       services.PluginRegistryService,
+      services.QueryCollectionService,
       { provide: services.QueryService, useValue: {
         loadQuery: () => {},
         loadUrl: () => {},

diff --git a/src/app/services/electron-app/electron-app.service.spec.ts b/src/app/services/electron-app/electron-app.service.spec.ts
@@ -6,11 +6,14 @@ import { WindowService, DbService, NotifyService } from '..';
 import { NgxElectronModule } from 'ngx-electron';
 import { empty as observableEmpty } from 'rxjs';
 import { ToastrModule } from 'ngx-toastr';
+import { GqlService } from '../gql/gql.service';
+import { HttpClientModule } from '@angular/common/http';
 
 describe('ElectronAppService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
+        HttpClientModule,
         NgxElectronModule,
         ToastrModule.forRoot(),
       ],
@@ -19,6 +22,7 @@ describe('ElectronAppService', () => {
         WindowService,
         DbService,
         NotifyService,
+        GqlService,
         {
           provide: Store, useValue: {
             subscribe: () => { },

diff --git a/src/app/services/keybinder/keybinder.service.spec.ts b/src/app/services/keybinder/keybinder.service.spec.ts
@@ -9,11 +9,14 @@ import { ElectronAppService } from '../electron-app/electron-app.service';
 import { ElectronService } from 'ngx-electron';
 import { NotifyService } from '../notify/notify.service';
 import { ToastrModule } from 'ngx-toastr';
+import { GqlService } from '../gql/gql.service';
+import { HttpClientModule } from '@angular/common/http';
 
 describe('KeybinderService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
+        HttpClientModule,
         ToastrModule.forRoot()
       ],
       providers: [
@@ -23,6 +26,7 @@ describe('KeybinderService', () => {
         ElectronAppService,
         ElectronService,
         NotifyService,
+        GqlService,
         {
           provide: Store, useValue: {
             subscribe: () => { },

diff --git a/src/app/services/window.service.spec.ts b/src/app/services/window.service.spec.ts
@@ -7,13 +7,21 @@ import { StoreModule, Store } from '@ngrx/store';
 import * as services from '../services';
 import { WindowService } from './window.service';
 import { GqlService } from './gql/gql.service';
+import { HttpClientModule } from '@angular/common/http';
+import { NotifyService } from './notify/notify.service';
+import { ToastrModule } from 'ngx-toastr';
 
 describe('WindowService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
+      imports: [
+        HttpClientModule,
+        ToastrModule.forRoot(),
+      ],
       providers: [
         WindowService,
         GqlService,
+        NotifyService,
         services.DbService,
         { provide: Store, useValue: {
           subscribe: () => {},