fix test failures

Author: Awk34

src/test/fixtures/.yo-rc.json

@@ -15,7 +15,7 @@
     "filters": {
       "js": true,
       "babel": true,
-      "flow": false,
+      "flow": true,
       "html": true,
       "sass": true,
       "ngroute": true,

src/test/main.test.js

@@ -17,6 +17,7 @@ import {
 const defaultOptions = {
   buildtool: 'gulp',
   transpiler: 'babel',
+  flow: true,
   markup: 'html',
   stylesheet: 'sass',
   router: 'ngroute',
@@ -263,6 +264,7 @@ describe('angular-fullstack:app', function() {
     var testOptions = {
       buildtool: 'gulp',
       transpiler: 'babel',
+      flow: true,
       markup: 'pug',
       stylesheet: 'css',
       router: 'ngroute',

templates/app/client/app/admin(auth)/admin.module.js

@@ -1,10 +1,8 @@
 import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-<%_ if(filters.uirouter) { %>
-import { UIRouterModule } from 'ui-router-ng2';<% } %>
-<%_ if(filters.ngroute) { %>
+import { BrowserModule } from '@angular/platform-browser';<% if(filters.uirouter) { %>
+import { UIRouterModule } from 'ui-router-ng2';<% } %><% if(filters.ngroute) { %>
 import { RouterModule, Routes } from '@angular/router';<% } %>
-
+import { AuthGuard } from '../../components/auth/auth-guard.service';
 import { AdminComponent } from './admin.component';
 
 <%_ if(filters.uirouter) { -%>
@@ -13,6 +11,7 @@ import { STATES } from './admin.routes';<% } %>
 const adminRoutes: Routes = [{
   path: 'admin',
   component: AdminComponent,
+  canActivate: [AuthGuard],
 }];<% } %>
 
 @NgModule({

templates/app/client/app/app.module.js

@@ -25,9 +25,9 @@ import { AuthHttp, AuthConfig } from 'angular2-jwt';
 
 import { AppComponent } from './app.component';
 import { MainModule } from './main/main.module';
-import { DirectivesModule } from '../components/directives.module';
+import { DirectivesModule } from '../components/directives.module';<% if(filters.auth) { %>
 import { AccountModule } from './account/account.module';
-import { AdminModule } from './admin/admin.module';
+import { AdminModule } from './admin/admin.module';<% } %>
 
 import constants from './app.constants';
 
@@ -72,9 +72,9 @@ const appRoutes: Routes = [{ path: '',
         <%_ if (filters.ngroute) { -%>
         RouterModule.forRoot(appRoutes, { enableTracing: process.env.NODE_ENV === 'development' }),<% } %>
         MainModule,
-        DirectivesModule,
+        DirectivesModule,<% if(filters.auth) { %>
         AccountModule,
-        AdminModule,
+        AdminModule,<% } %>
     ],
     declarations: [
         AppComponent,

templates/app/client/app/main/main.component.js

@@ -1,7 +1,8 @@
 import { Component, OnInit<% if(filters.ws) { %>, OnDestroy<% } %> } from '@angular/core';
 import { Http } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
-import { SocketService } from '../../components/socket/socket.service';
+import 'rxjs/add/operator/map';<% if(filters.ws) { %>
+import { SocketService } from '../../components/socket/socket.service';<% } %>
 
 @Component({
     selector: 'main',
@@ -16,7 +17,7 @@ export class MainComponent implements OnInit<% if(filters.ws) { %>, OnDestroy<%
   <%_ if(filters.models) { -%>
   newThing = '';<% } %>
 
-  static parameters = [Http, SocketService];
+  static parameters = [Http<% if(filters.ws) { %>, SocketService<% } %>];
   constructor(<%= private() %>http: Http<% if(filters.ws) { %>, <%= private() %>socketService: SocketService<% } %>) {
     this.Http = http;
     <%_ if(filters.ws) { -%>

templates/app/client/app/main/main.component.spec.js

@@ -17,9 +17,9 @@ import { MockBackend } from '@angular/http/testing';
 <%_ if(filters.mocha && filters.expect) { -%>
 import { expect } from 'chai';<% } %><% if(filters.uibootstrap) { %>
 import { TooltipModule } from 'ngx-bootstrap';<% } %>
-import { FormsModule } from '@angular/forms';
+import { FormsModule } from '@angular/forms';<% if(filters.ws) { %>
 import { SocketService } from '../../components/socket/socket.service';
-import { SocketServiceStub } from '../../components/socket/socket.mock';
+import { SocketServiceStub } from '../../components/socket/socket.mock';<% } %>
 import { MainComponent } from './main.component';
 
 describe('Component: MainComponent', function() {
@@ -41,21 +41,21 @@ describe('Component: MainComponent', function() {
           provide: Http,
           useFactory: (backend: ConnectionBackend, defaultOptions: BaseRequestOptions) => {
             return new Http(backend, defaultOptions);
-          },<%_ if(filters.ws) { %>
-          deps: [MockBackend, BaseRequestOptions]<% } %>
-        },
-        { provide: SocketService, useClass: SocketServiceStub },
+          },
+          deps: [MockBackend, BaseRequestOptions]
+        },<% if(filters.ws) { %>
+        { provide: SocketService, useClass: SocketServiceStub },<% } %>
       ],
     }).compileComponents();
   }));
-  <%_ if(filters.ws) { %>
+
   beforeEach(async(inject([MockBackend], (mockBackend) => {
     mockBackend.connections.subscribe(conn => {
       conn.mockRespond(new Response(new ResponseOptions({
         body: JSON.stringify(['HTML5 Boilerplate', 'AngularJS', 'Karma', 'Express'])
       })));
     });
-  })));<% } %>
+  })));
 
   beforeEach(async(() => {
     fixture = TestBed.createComponent(MainComponent);
@@ -69,7 +69,7 @@ describe('Component: MainComponent', function() {
   }));
 
   it('should attach a list of things to the controller', () => {<% if(filters.jasmine) { %>
-    expect(comp.awesomeThings.length).toEqual(4);<% } else if(filters.mocha) { -%>
+    expect(comp.awesomeThings.length).toEqual(4);<% } else if(filters.mocha) { %>
     <%= expect() %>comp.awesomeThings.length<%= to() %>.equal(4);<% } %>
   });
 });

templates/app/client/components/directives.module.js

@@ -7,8 +7,8 @@ import { CollapseModule } from 'ngx-bootstrap';<% } %>
 import { UIRouterModule } from 'ui-router-ng2';<% } %>
 <%_ if (filters.ngroute) { -%>
 import { RouterModule } from '@angular/router';<% } %>
-
-import { AuthModule } from './auth/auth.module';
+<% if(filters.auth) { %>
+import { AuthModule } from './auth/auth.module';<% } %>
 
 import { NavbarComponent } from './navbar/navbar.component';
 import { FooterComponent } from './footer/footer.component';
@@ -17,9 +17,9 @@ import { OauthButtonsComponent } from './oauth-buttons/oauth-buttons.component';
 
 @NgModule({
   imports: [
-    CommonModule,
-  <% if(filters.uibootstrap) { %>CollapseModule,<% } %>
-    AuthModule,
+    CommonModule,<% if(filters.uibootstrap) { %>
+    CollapseModule,<% } %><% if(filters.auth) { %>
+    AuthModule,<% } %>
     <%_ if (filters.uirouter) { -%>
     UIRouterModule,<% } %>
     <%_ if (filters.ngroute) { -%>