fix(ngrx): bump version to beta.1 and fix tests

tomastrajan · Feb 20, 2020 · 5f25dff · 5f25dff
1 parent 191a02f
commit 5f25dff
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "build:prod": "ng build --prod",
     "lint": "ng lint",
     "test": "ng lint && ng test --configuration=test",
-    "watch": "ng test --configuration=test --browsers ChromeHeadless --watch",
+    "watch": "ng test --configuration=test --browsers ChromeHeadless --watch --reporters dots",
     "e2e": "ng e2e",
     "ci": "npm run format:test && ng lint && ng test --configuration=test --browsers ChromeTravisCi --code-coverage && npm run e2e && npm run build:prod -- --deploy-url /angular-ngrx-material-starter/ --base-href /angular-ngrx-material-starter",
     "format:write": "prettier projects/**/*.{ts,json,md,scss} --write",
@@ -52,11 +52,11 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.27",
     "@fortawesome/free-brands-svg-icons": "^5.12.1",
     "@fortawesome/free-solid-svg-icons": "^5.12.1",
-    "@ngrx/effects": "^9.0.0-beta.0",
-    "@ngrx/entity": "^9.0.0-beta.0",
-    "@ngrx/router-store": "^9.0.0-beta.0",
-    "@ngrx/store": "^9.0.0-beta.0",
-    "@ngrx/store-devtools": "^9.0.0-beta.0",
+    "@ngrx/effects": "^9.0.0-beta.1",
+    "@ngrx/entity": "^9.0.0-beta.1",
+    "@ngrx/router-store": "^9.0.0-beta.1",
+    "@ngrx/store": "^9.0.0-beta.1",
+    "@ngrx/store-devtools": "^9.0.0-beta.1",
     "@ngx-translate/core": "^12.0.0",
     "@ngx-translate/http-loader": "^4.0.0",
     "bootstrap": "^4.4.1",

diff --git a/projects/angular-ngrx-material-starter/src/app/app/app.component.spec.ts b/projects/angular-ngrx-material-starter/src/app/app/app.component.spec.ts
@@ -29,7 +29,7 @@ describe('AppComponent', () => {
       declarations: [AppComponent]
     }).compileComponents();
 
-    store = TestBed.inject<MockStore>(MockStore);
+    store = TestBed.inject(MockStore);
     store.overrideSelector(selectIsAuthenticated, false);
     store.overrideSelector(selectSettingsStickyHeader, true);
     store.overrideSelector(selectSettingsLanguage, 'en');

diff --git a/projects/angular-ngrx-material-starter/src/app/core/auth/auth-guard.service.spec.ts b/projects/angular-ngrx-material-starter/src/app/core/auth/auth-guard.service.spec.ts
@@ -17,7 +17,7 @@ describe('AuthGuardService', () => {
       providers: [AuthGuardService, provideMockStore()]
     });
     authGuardService = TestBed.inject<AuthGuardService>(AuthGuardService);
-    store = TestBed.inject<MockStore>(MockStore);
+    store = TestBed.inject(MockStore);
     store.overrideSelector(selectIsAuthenticated, true);
   });
 

diff --git a/...ar-ngrx-material-starter/src/app/features/examples/crud/components/crud.component.spec.ts b/...ar-ngrx-material-starter/src/app/features/examples/crud/components/crud.component.spec.ts
@@ -6,11 +6,10 @@ import { provideMockStore, MockStore } from '@ngrx/store/testing';
 
 import { SharedModule } from '../../../../shared/shared.module';
 
-import { State } from '../../examples.state';
 import { CrudComponent } from './crud.component';
 import { selectAllBooks, selectSelectedBook } from '../books.selectors';
 
-xdescribe('CrudComponent', () => {
+describe('CrudComponent', () => {
   let component: CrudComponent;
   let fixture: ComponentFixture<CrudComponent>;
   let store: MockStore;
@@ -26,7 +25,7 @@ xdescribe('CrudComponent', () => {
       providers: [provideMockStore()],
       declarations: [CrudComponent]
     }).compileComponents();
-    store = TestBed.inject<MockStore>(MockStore);
+    store = TestBed.inject(MockStore);
     store.overrideSelector(selectAllBooks, []);
     store.overrideSelector(selectSelectedBook, null);
     fixture = TestBed.createComponent(CrudComponent);

diff --git a/...ar-ngrx-material-starter/src/app/features/examples/form/components/form.component.spec.ts b/...ar-ngrx-material-starter/src/app/features/examples/form/components/form.component.spec.ts
@@ -11,7 +11,7 @@ import { FormComponent } from './form.component';
 import { selectFormState } from '../form.selectors';
 import { Form } from '../form.model';
 
-xdescribe('FormComponent', () => {
+describe('FormComponent', () => {
   let store: MockStore;
   let component: FormComponent;
   let fixture: ComponentFixture<FormComponent>;
@@ -33,7 +33,7 @@ xdescribe('FormComponent', () => {
       providers: [provideMockStore(), NotificationService]
     });
 
-    store = TestBed.inject<MockStore>(MockStore);
+    store = TestBed.inject(MockStore);
     store.overrideSelector(selectFormState, { form: {} as Form });
     fixture = TestBed.createComponent(FormComponent);
     component = fixture.componentInstance;

diff --git a/...rc/app/features/examples/stock-market/components/stock-market-container.component.spec.ts b/...rc/app/features/examples/stock-market/components/stock-market-container.component.spec.ts
@@ -15,7 +15,7 @@ import { StockMarketContainerComponent } from './stock-market-container.componen
 import { selectStockMarket } from '../stock-market.selectors';
 import { StockMarketState } from '../stock-market.model';
 
-xdescribe('StockMarketContainerComponent', () => {
+describe('StockMarketContainerComponent', () => {
   let retrieveStockSpy: jasmine.Spy;
 
   let component: StockMarketContainerComponent;
@@ -61,7 +61,7 @@ xdescribe('StockMarketContainerComponent', () => {
         'retrieveStock'
       ).and.returnValue(EMPTY);
 
-      store = TestBed.inject<MockStore>(MockStore);
+      store = TestBed.inject(MockStore);
       mockSelectStockMarket = store.overrideSelector(selectStockMarket, {
         symbol: 'AAPL',
         loading: false

diff --git a/...rial-starter/src/app/features/examples/todos/components/todos-container.component.spec.ts b/...rial-starter/src/app/features/examples/todos/components/todos-container.component.spec.ts
@@ -16,7 +16,7 @@ import {
   selectTodosState
 } from '../todos.selectors';
 
-xdescribe('TodosComponent', () => {
+describe('TodosComponent', () => {
   let store: MockStore;
   let component: TodosContainerComponent;
   let fixture: ComponentFixture<TodosContainerComponent>;
@@ -56,7 +56,7 @@ xdescribe('TodosComponent', () => {
       providers: [provideMockStore()]
     });
 
-    store = TestBed.inject<MockStore>(MockStore);
+    store = TestBed.inject(MockStore);
     mockSelectTodos = store.overrideSelector(selectTodos, []);
     mockSelectRemoveDoneTodosDisabled = store.overrideSelector(
       selectRemoveDoneTodosDisabled,

diff --git a/...-material-starter/src/app/features/settings/settings/settings-container.component.spec.ts b/...-material-starter/src/app/features/settings/settings/settings-container.component.spec.ts
@@ -4,6 +4,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 import { provideMockStore, MockStore } from '@ngrx/store/testing';
+import { MemoizedSelector } from '@ngrx/store';
+import {
+  FaIconLibrary,
+  FontAwesomeModule
+} from '@fortawesome/angular-fontawesome';
+import { faBars } from '@fortawesome/free-solid-svg-icons';
 
 import { SharedModule } from '../../../shared/shared.module';
 
@@ -18,11 +24,12 @@ import {
 import { selectSettings } from '../../../core/settings/settings.selectors';
 import { SettingsState } from '../../../core/settings/settings.model';
 
-xdescribe('SettingsComponent', () => {
+describe('SettingsComponent', () => {
   let component: SettingsContainerComponent;
   let fixture: ComponentFixture<SettingsContainerComponent>;
   let store: MockStore;
   let dispatchSpy;
+  let mockSelectSettings: MemoizedSelector<{}, SettingsState>;
 
   const getThemeSelectArrow = () =>
     fixture.debugElement.queryAll(By.css('.mat-select-trigger'))[1];
@@ -31,13 +38,23 @@ xdescribe('SettingsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [SharedModule, NoopAnimationsModule, TranslateModule.forRoot()],
+      imports: [
+        FontAwesomeModule,
+        SharedModule,
+        NoopAnimationsModule,
+        TranslateModule.forRoot()
+      ],
       providers: [provideMockStore()],
       declarations: [SettingsContainerComponent]
     }).compileComponents();
 
-    store = TestBed.inject<MockStore>(MockStore);
-    store.overrideSelector(selectSettings, {} as SettingsState);
+    TestBed.inject(FaIconLibrary).addIcons(faBars);
+
+    store = TestBed.inject(MockStore);
+    mockSelectSettings = store.overrideSelector(
+      selectSettings,
+      {} as SettingsState
+    );
     fixture = TestBed.createComponent(SettingsContainerComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
@@ -116,17 +133,17 @@ xdescribe('SettingsComponent', () => {
   });
 
   it('should disable change animations page when disabled is set in state', () => {
-    store.setState({
-      settings: {
-        pageAnimationsDisabled: true
-      }
-    });
+    mockSelectSettings.setResult({
+      pageAnimationsDisabled: true
+    } as SettingsState);
+    store.refreshState();
     fixture.detectChanges();
 
     dispatchSpy = spyOn(store, 'dispatch');
     const componentDebug = fixture.debugElement;
     const slider = componentDebug.queryAll(By.directive(MatSlideToggle))[2];
 
+    console.log(slider);
     slider.triggerEventHandler('change', { checked: false });
     fixture.detectChanges();