Merge pull request #1 from stonelasley/master

update with forked repo

Author: MagicAardvark

README.md

@@ -30,7 +30,6 @@ to be used in your tests it should be safe to pull into a project.
 - Popover
 - PopoverController
 - NavController
-- Nav
 - NavParams
 - StatusBar
 - Storage
@@ -42,10 +41,12 @@ to be used in your tests it should be safe to pull into a project.
 
 ## Native Plugins
 - 3DTouch
+- GoogleAnalyics
 - Keyboard
 - Network
+- NFC
 - Splashscreen
-- Network
+- StatusBar
 
 ## Installation
 ```bash
@@ -131,6 +132,16 @@ TestBed.configureTestingModule({
     ]
 });
 ```
+# Contributing
+This project has a long way to go and is full of opportunities to contribute.
+I am back in school and working so for the rest of the year expect my responsiveness on this project to be slow. If anyone is up to helping vet PRs please message me. sclarklasley@gmail.com
+
+## Contributors
+  - [Felix Whittmann](https://github.com/hfwittmann)
+  - [Leif Wells](https://github.com/leifwells)
+  - [Damir Arh](https://github.com/damirarh)
+  - [Rvdleun](https://github.com/rvdleun)
+  - [Andrey Zakharov](https://github.com/enstain)
 
 ### Frequently Asked Questions:
 
@@ -153,6 +164,5 @@ Make sure you are using the `useFactory` property name and using the fat arrow f
 
 ```ts
 // DO THIS
-{ provide: App, useClass: () => AppMock.instance() }
+{ provide: App, useFactory: () => AppMock.instance() }
 ```
-

package.json

@@ -1,11 +1,22 @@
 {
   "name": "ionic-mocks",
-  "version": "0.13.0",
-  "description": "Stubbed and Pre-mocked Ionic2 Objects",
+  "version": "1.0.3",
+  "description": "Stubbed and Pre-mocked Ionic2+ Objects",
   "repository": "git@github.com:stonelasley/ionic-mocks.git",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "author": "Stone C. Lasley",
+  "keywords": [
+    "ionic",
+    "ionic2",
+    "ionic3",
+    "mocks",
+    "mock",
+    "doubles"
+  ],
+  "bugs": {
+    "url": "https://github.com/stonelasley/ionic-mocks"
+  },
   "license": "MIT",
   "scripts": {
     "test": "karma start",

src/angular/alert.ts

@@ -1,8 +1,17 @@
 export class AlertMock {
     public static instance(): any {
-        let instance = jasmine.createSpyObj('Alert', ['present', 'dismiss']);
+    	let _dismissCallback: Function;
+        let instance = jasmine.createSpyObj('Alert', ['present', 'dismiss', 'onDidDismiss']);
         instance.present.and.returnValue(Promise.resolve());
-        instance.dismiss.and.returnValue(Promise.resolve());
+
+        instance.dismiss.and.callFake(() => {
+            _dismissCallback();
+            return Promise.resolve();
+        });
+
+        instance.onDidDismiss.and.callFake((callback: Function) => {
+            _dismissCallback = callback;
+        });
 
         return instance;
     }

src/angular/index.ts

@@ -16,7 +16,6 @@ import {MenuControllerMock}           from './menu-controller';
 import {ModalMock}                    from './modal';
 import {ModalControllerMock}          from './modal-controller';
 import {NavControllerMock}            from './nav-controller';
-import {NavMock}                      from './nav';
 import {NavParamsMock}                 from './nav-params';
 import {TabMock}                      from './tab';
 import {TabsMock}                     from './tabs';
@@ -48,7 +47,6 @@ export {
     ModalMock,
     ModalControllerMock,
     NavControllerMock,
-    NavMock,
     NavParamsMock,
     TabMock,
     TabsMock,

src/angular/modal.ts

@@ -1,8 +1,17 @@
 export class ModalMock {
     public static instance(): any {
+    	let _dismissCallback: Function;
         let instance = jasmine.createSpyObj('Modal', ['present', 'dismiss', 'onDidDismiss']);
         instance.present.and.returnValue(Promise.resolve());
-        instance.dismiss.and.returnValue(Promise.resolve());
+        
+        instance.dismiss.and.callFake(() => {
+            _dismissCallback();
+            return Promise.resolve();
+        });
+
+        instance.onDidDismiss.and.callFake((callback: Function) => {
+            _dismissCallback = callback;
+        });
 
         return instance;
     }

src/angular/nav-controller.spec.ts

@@ -0,0 +1,8 @@
+import { NavControllerMock } from './nav-controller';
+describe('NavControllerMock', () => {
+	it('should initialize', () => {
+		let instance = NavControllerMock.instance();
+		expect(instance).toBeDefined();
+	});
+
+});

src/angular/nav-controller.ts

@@ -1,22 +1,95 @@
+import {Observable} from 'rxjs/Observable';
+import { ViewControllerMock } from './view-controller';
+
 export class NavControllerMock {
+
     public static instance(): any {
 
-        let instance = jasmine.createSpyObj('navController', [
+        let instance: any = jasmine.createSpyObj('NavController', [
+            'goToRoot',
+            'initPane',
+            'paneChanged',
             'push',
+            'insert',
+            'insertPage',
             'pop',
-            'ionViewDidLoad',
-            'ionViewWillEnter',
-            'ionViewDidEnter',
-            'ionViewWillLeave',
-            'ionViewWillUnload',
-            'ionViewCanEnter',
-            'ionViewCanLeave'
+            'popTo',
+            'popToRoot',
+            'popAll',
+            'remove',
+            'removeView',
+            'setRoot',
+            'setPages',
+            'hasChildren',
+            'getActiveChildNav',
+            'registerChildNav',
+            'unregisterChildNav',
+            'destroy',
+            'swipeBackStart',
+            'swipeBackProgress',
+            'swipeBackEnd',
+            'canSwipeBack',
+            'canGoBack',
+            'isTransitioning',
+            'setTransitioning',
+            'getActive',
+            'isActive',
+            'getByIndex',
+            'getPrevious',
+            'first',
+            'last',
+            'indexOf',
+            'length',
+            'getViews',
+            'isSwipeBackEnabled',
+            'dismissPageChangeViews',
+            'setViewPort',
+            'resize',
+            'viewDidEnter',
+            'viewDidLeave',
+            'viewDidLoad',
+            'viewWillEnter',
+            'viewWillLeave',
+            'viewWillUnload'
         ]);
 
+        instance.goToRoot.and.returnValue(Promise.resolve());
+        instance.initPane.and.returnValue(1);
+
+        instance['root'] = ViewControllerMock.instance();
+        instance['rootParams'] = {};
+
         instance.push.and.returnValue(Promise.resolve());
+        instance.insert.and.returnValue(Promise.resolve());
+        instance.insertPage.and.returnValue(Promise.resolve());
         instance.pop.and.returnValue(Promise.resolve());
-        instance.ionViewCanEnter.and.returnValue(true);
-        instance.ionViewCanLeave.and.returnValue(true);
+        instance.popTo.and.returnValue(Promise.resolve());
+        instance.popToRoot.and.returnValue(Promise.resolve());
+        instance.popAll.and.returnValue(Promise.resolve());
+        instance.remove.and.returnValue(Promise.resolve());
+        instance.removeView.and.returnValue(Promise.resolve());
+        instance.setRoot.and.returnValue(Promise.resolve());
+        instance.setPages.and.returnValue(Promise.resolve());
+        instance.hasChildren.and.returnValue(true);
+        instance.canSwipeBack.and.returnValue(true);
+        instance.canGoBack.and.returnValue(true);
+        instance.isTransitioning.and.returnValue(false);
+        instance.getActive.and.returnValue(ViewControllerMock.instance());
+        instance.isActive.and.returnValue(true);
+        instance.getByIndex.and.returnValue(ViewControllerMock.instance());
+        instance.getPrevious.and.returnValue(ViewControllerMock.instance());
+        instance.first.and.returnValue(ViewControllerMock.instance());
+        instance.last.and.returnValue(ViewControllerMock.instance());
+        instance.indexOf.and.returnValue(0);
+        instance.length.and.returnValue(0);
+        instance.getViews.and.returnValue([]);
+        instance.isSwipeBackEnabled.and.returnValue(true);
+        instance.viewDidEnter = Observable.of();
+        instance.viewDidLeave = Observable.of();
+        instance.viewDidLoad = Observable.of();
+        instance.viewWillEnter = Observable.of();
+        instance.viewWillLeave = Observable.of();
+        instance.viewWillUnload = Observable.of();
 
         return instance;
     }

src/angular/nav.ts

@@ -0,0 +1,8 @@
+import { ViewControllerMock } from './view-controller';
+describe('ViewControllerMock', () => {
+	it('should initialize', () => {
+		let instance = ViewControllerMock.instance();
+		expect(instance).toBeDefined();
+	});
+
+});