add selector tests and adding dependencies

Author: jessesanders

src/ngrx-entity/__files__/__name@dasherize@if-flat__/__name@dasherize__.effects.spec.ts

@@ -66,7 +66,7 @@ describe('<%= classify(name) %>Effects', () => {
       service.create.and.returnValue(cold('-e|', { e: entity }));
       const expected = cold('-s', { s: successAction });
 
-      expect(effects.insert).toBeObservable(expected);
+      expect(effects.create).toBeObservable(expected);
     });
 
     it('should return Create<%= classify(name) %>Fail with error object on failure', () => {
@@ -78,7 +78,7 @@ describe('<%= classify(name) %>Effects', () => {
       service.create.and.returnValue(cold('-#|', {}, { message: 'fail'}));
       const expected = cold('-f', { f: failAction });
 
-      expect(effects.insert).toBeObservable(expected);
+      expect(effects.create).toBeObservable(expected);
     });
   });
 

src/ngrx-entity/__files__/__name@dasherize@if-flat__/__name@dasherize__.reducer.spec.ts

@@ -58,13 +58,13 @@ describe('<%= name %>Reducer', () => {
 
   describe('upon Create<%= classify(name) %>Fail', () => {
     it('should set loading to true and echo the error', () => {
-      const error = 'test insert error';
+      const error = 'test create error';
       const action = new actions.Create<%= classify(name) %>Fail({ error });
 
       expect(<%= name %>Reducer(initial<%= classify(name)%>State, action)).toEqual({
         ...initial<%= classify(name)%>State,
         loading: false,
-        error: `<%= classify(name) %> insert failed: ${error}`
+        error: `<%= classify(name) %> create failed: ${error}`
       });
     });
   });

src/ngrx-entity/__files__/__name@dasherize@if-flat__/index.spec.ts

@@ -0,0 +1,68 @@
+import {
+  current<%= classify(name) %>Id,
+  current<%= classify(name) %>,
+  <%= name %>Loading,
+  <%= name %>Error,
+  <%= name %>Query
+} from "./index";
+import { <%= classify(name) %> } from "./<%= name %>.model";
+
+const create<%= classify(name) %> = ({ id = 0, name = "", description = "" } = {}): <%= classify(name) %> => ({
+  id: id,
+  name: name || "name",
+  description: description || `description`
+});
+
+// State Factory
+const create<%= classify(name) %>sState = ({
+  entities = {
+    "1": create<%= classify(name) %>({ id: 1, name: "Bob" }),
+    "2": create<%= classify(name) %>({ id: 2, name: "Sue" }),
+    "3": create<%= classify(name) %>({ id: 3, name: "Mary" })
+  },
+  ids = ["1", "2", "3"],
+  selectedId = 1,
+  loading = false,
+  error = "",
+  query = null
+} = {}) => ({
+  <%= name %>: {
+    ids,
+    entities,
+    selectedId,
+    loading,
+    error,
+    query
+  }
+});
+
+let state;
+
+describe("<%= name %>Selectors", () => {
+  beforeEach(() => {
+    state = create<%= classify(name) %>sState();
+  });
+
+  it("current<%= classify(name) %>Id", () => {
+    expect(current<%= classify(name) %>Id(state)).toEqual(1);
+  });
+
+  it("current<%= classify(name) %>", () => {
+    expect(current<%= classify(name) %>(state)).toEqual(state.<%= name %>.entities[1]);
+  });
+
+  it("<%= name %>Loading", () => {
+    state.<%= name %>.loading = true;
+    expect(<%= name %>Loading(state)).toEqual(state.<%= name %>.loading);
+  });
+
+  it("<%= name %>Error", () => {
+    state.<%= name %>.error = 'error loading <%= name %>s';
+    expect(<%= name %>Error(state)).toEqual(state.<%= name %>.error);
+  });
+
+  it("<%= name %>Query", () => {
+    state.<%= name %>.query = 'page;=2'
+    expect(<%= name %>Query(state)).toEqual(state.<%= name %>.query);
+  });
+});

src/ngrx-entity/__files__/state.module.ts

@@ -1,4 +1,5 @@
 import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
 import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
 import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
 
@@ -14,6 +15,7 @@ import { <%= classify(name) %>Effects } from './<%= dasherize(name) %>/<%= dashe
 @NgModule({
   imports: [
     CommonModule,
+    HttpClientModule,
     StoreRouterConnectingModule,
     StoreModule.forRoot(appReducer, { metaReducers: appMetaReducers }),
     EffectsModule.forRoot([<%= classify(name) %>Effects]),

src/ngrx-entity/index.ts

@@ -11,7 +11,8 @@ import {
   template,
   filter,
   noop,
-  SchematicsException
+  SchematicsException,
+  mergeWith
 } from "@angular-devkit/schematics";
 import {
   NgRxOptions,
@@ -29,7 +30,7 @@ import {
 
 export default function(options: NgRxOptions): Rule {
   return (tree: Tree, context: SchematicContext) => {
-    return chain([updateDependencies(), addNgRxFiles(options)])(tree, context);
+    return chain([addNgRxFiles(options), updateDependencies()])(tree, context);
   };
 }
 
@@ -126,6 +127,9 @@ function addNgRxFiles(options: NgRxOptions): Rule {
       move(options.path)
     ]);
 
-    return templateSource(context);
+    return chain([mergeWith(templateSource)])(
+      tree,
+      context
+    );
   };
 }

src/ngrx-entity/utility/json-utils.ts

@@ -102,16 +102,6 @@ export function insertPropertyInAstObjectInOrder(
       )}` +
       ","
   );
-
-  console.log(
-    insertIndex,
-    `${indentStr}` +
-      `"${propertyName}": ${JSON.stringify(value, null, 2).replace(
-        /\n/g,
-        indentStr
-      )}` +
-      ","
-  );
 }
 
 export function appendValueInAstArray(