udpated circle config; fixed e2e test errors

.circleci/config.yml

@@ -2,7 +2,7 @@
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
 version: 2
 jobs:
-  build:
+  build-and-test:
     docker:
       - image: circleci/node:9-browsers
     working_directory: ~/insight/app
@@ -13,6 +13,7 @@ jobs:
           keys:
           - dependency-cache-{{ checksum "package.json" }}
       - run: npm install
+      - run: npm run test:ci
       - save_cache:
           paths:
             - node_modules
@@ -22,35 +23,8 @@ jobs:
       - store_test_results:
           path: ./test
 
-  test:
-    docker:
-      - image: circleci/node:9-browsers
-    working_directory: ~/insight/app
-    steps:
-      - checkout
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - dependency-cache-{{ checksum "package.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - dependency-cache-
-      - run: npm install
-      - save_cache:
-          paths:
-            - node_modules
-          key: dependency-cache-{{ checksum "package.json" }}
-      - run: npm run test
-      - store_artifacts:
-          path: ./test
-      - store_test_results:
-          path: ./test
-
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - build
+      - build-and-test
-      - test:
-          requires:
-            - build
-

app/e2e/app.e2e-spec.ts

@@ -7,7 +7,7 @@ describe('InsightApp', () => {
   });
 
   it('should have a title', () => {
-    expect(browser.getTitle()).toEqual('Home');
+    expect(browser.getTitle()).toEqual('Insight');
   });
 
   it('should have {nav}', () => {

app/package.json

@@ -14,8 +14,8 @@
     "postinstall": "webdriver-manager update --gecko false",
     "start": "ionic serve",
     "test": "ng test --code-coverage",
-    "cov": "opn coverage/index.html",
+    "test:ci": "ng test --watch=false --code-coverage && npm run e2e",
-    "test-ci": "ng test --watch=false --code-coverage && npm run e2e"
+    "cov": "opn coverage/index.html"
   },
   "dependencies": {
     "@angular/common": "4.1.3",
@@ -40,7 +40,7 @@
     "zone.js": "0.8.12"
   },
   "devDependencies": {
-    "@angular/cli": "1.1.2",
+    "@angular/cli": "^1.1.2",
     "@ionic/app-scripts": "1.3.7",
     "@types/jasmine": "2.5.41",
     "@types/node": "7.0.4",

app/src/app/app.spec.ts

@@ -1,8 +1,7 @@
 import { InsightApp } from './app.component';
-import { TestBed, getTestBed, inject, async } from '@angular/core/testing';
+import { TestBed, getTestBed } from '@angular/core/testing';
 import { Platform } from 'ionic-angular';
 import { NavMock } from '../mocks';
-import { BroadcastTxPage } from '../pages';
 import { PopoverController, MenuController } from 'ionic-angular';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';