Skip to content

Commit 9881d5c

Browse files
MagicAardvarkMagicAardvark
committed
adding support for jest by creating custom createSpyObject
1 parent 4e176c4 commit 9881d5c

40 files changed

+126
-59
lines changed

‎src/angular/action-sheet-controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import {ActionSheetMock} from './action-sheet';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { ActionSheetMock } from './action-sheet';
23

34
export class ActionSheetControllerMock {
45
public static instance(actionSheet?: ActionSheetMock): any {
56

6-
let instance = jasmine.createSpyObj('ActionSheetController', ['create']);
7+
let instance = createSpyObj('ActionSheetController', ['create']);
78
instance.create.and.returnValue(actionSheet || ActionSheetMock.instance());
89

910
return instance;

‎src/angular/action-sheet.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class ActionSheetMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('ActionSheet', ['present', 'dismiss']);
5+
let instance = createSpyObj('ActionSheet', ['present', 'dismiss']);
46
instance.present.and.returnValue(Promise.resolve());
57
instance.dismiss.and.returnValue(Promise.resolve());
68

‎src/angular/alert-controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import {AlertMock} from './alert';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { AlertMock } from './alert';
23

34
export class AlertControllerMock {
45
public static instance(alertMock?: AlertMock): any {
56

6-
let instance = jasmine.createSpyObj('AlertController', ['create']);
7+
let instance = createSpyObj('AlertController', ['create']);
78
instance.create.and.returnValue(alertMock || AlertMock.instance());
89

910
return instance;

‎src/angular/alert.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class AlertMock {
24
public static instance(): any {
35
let _dismissCallback: Function;
4-
let instance = jasmine.createSpyObj('Alert', ['present', 'dismiss', 'onDidDismiss']);
6+
let instance = createSpyObj('Alert', ['present', 'dismiss', 'onDidDismiss']);
57
instance.present.and.returnValue(Promise.resolve());
68

79
instance.dismiss.and.callFake(() => {

‎src/angular/app.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import {Observable} from 'rxjs';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { Observable } from 'rxjs';
23
import {NavControllerMock} from './nav-controller';
34

45
export class AppMock {
56
public static instance(navCtrl?: NavControllerMock, viewObservable?: Observable<any>): any {
67

7-
let instance = jasmine.createSpyObj('App', [
8+
let instance = createSpyObj('App', [
89
'getActiveNav',
910
'getRootNav',
1011
'isScrolling',

‎src/angular/config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class ConfigMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('Config', [
5+
let instance = createSpyObj('Config', [
46
'get',
57
'getBoolean',
68
'getNumber',

‎src/angular/content.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class ContentMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('Content', ['addImg', 'getContentDimensions', 'getFixedElement', 'resize', 'scrollTo', 'scrollToBottom', 'scrollToTop']);
5+
let instance = createSpyObj('Content', ['addImg', 'getContentDimensions', 'getFixedElement', 'resize', 'scrollTo', 'scrollToBottom', 'scrollToTop']);
46
instance['contentBottom'] = 10;
57
instance['contentHeight'] = 10;
68
instance['contentTop'] = 10;

‎src/angular/events.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class EventsMock {
24
public static instance(): any {
3-
return jasmine.createSpyObj('events', ['subscribe', 'publish', 'unsubscribe']);
5+
return createSpyObj('events', ['subscribe', 'publish', 'unsubscribe']);
46
}
57
}

‎src/angular/form.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class FormMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('Form', [
5+
let instance = createSpyObj('Form', [
46
'register',
57
'nextId',
68
'deregister',

‎src/angular/haptic.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class HapticMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('Haptic', ['available',
5+
let instance = createSpyObj('Haptic', ['available',
46
'gestureSelectionChanged',
57
'gestureSelectionEnd',
68
'gestureSelectionStart',

‎src/angular/inifinite-scroll.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class InfiniteScrollMock {
24
public static instance(): any {
3-
return jasmine.createSpyObj('InfiniteScroll', ['complete', 'enable', 'waitFor']);
5+
return createSpyObj('InfiniteScroll', ['complete', 'enable', 'waitFor']);
46
}
57
}

‎src/angular/item-sliding.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class ItemSlidingMock {
24
public static instance(): any {
3-
return jasmine.createSpyObj('ItemSliding', ['close']);
5+
return createSpyObj('ItemSliding', ['close']);
46
}
57
}

‎src/angular/keyboard.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import { createSpyObj } from '../utilities/create-spy';
12
import { Observable } from 'rxjs/Observable';
23

34
export class IonKeyboardMock {
45
public static instance(): any {
5-
let instance = jasmine.createSpyObj('Keyboard', [
6+
let instance = createSpyObj('Keyboard', [
67
'close',
78
'didHide',
89
'didShow',

‎src/angular/loading-controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import {LoadingMock} from './loading';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { LoadingMock } from './loading';
23

34
export class LoadingControllerMock {
45
public static instance(loading?: LoadingMock): any {
56

6-
let instance = jasmine.createSpyObj('LoadingController', ['create']);
7+
let instance = createSpyObj('LoadingController', ['create']);
78
instance.create.and.returnValue(loading || LoadingMock.instance());
89

910
return instance;

‎src/angular/loading.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class LoadingMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('Loading', ['present', 'dismiss', 'setContent', 'setSpinner']);
5+
let instance = createSpyObj('Loading', ['present', 'dismiss', 'setContent', 'setSpinner']);
46
instance.present.and.returnValue(Promise.resolve());
57

68
return instance;

‎src/angular/menu-controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import {MenuMock} from './menu';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { MenuMock } from './menu';
23

34
export class MenuControllerMock {
45
public static instance(menu?: MenuMock): any {
56
let m = menu || MenuMock.instance();
6-
let instance = jasmine.createSpyObj('MenuController', ['close', 'enable', 'get', 'getMenus', 'getOpen', 'isEnabled', 'isOpen', 'open', 'swipeEnabled', 'toggle']);
7+
let instance = createSpyObj('MenuController', ['close', 'enable', 'get', 'getMenus', 'getOpen', 'isEnabled', 'isOpen', 'open', 'swipeEnabled', 'toggle']);
78
instance.close.and.returnValue(Promise.resolve());
89
instance.enable.and.returnValue(m);
910
instance.get.and.returnValue(m);

‎src/angular/menu.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class MenuMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('Menu', ['blank', 'open', 'close']);
5+
let instance = createSpyObj('Menu', ['blank', 'open', 'close']);
46
instance['content'] = 'menu content';
57
instance['enabled'] = true;
68
instance['id'] = 'menuId';

‎src/angular/modal-controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import {ModalMock} from './modal';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { ModalMock } from './modal';
23

34
export class ModalControllerMock {
45
public static instance(modalMock?: ModalMock): any {
5-
let instance = jasmine.createSpyObj('ModalController', ['create']);
6+
let instance = createSpyObj('ModalController', ['create']);
67
instance.create.and.returnValue(modalMock || ModalMock.instance());
78

89
return instance;

‎src/angular/modal.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class ModalMock {
24
public static instance(): any {
35
let _dismissCallback: Function;
4-
let instance = jasmine.createSpyObj('Modal', ['present', 'dismiss', 'onDidDismiss']);
6+
let instance = createSpyObj('Modal', ['present', 'dismiss', 'onDidDismiss']);
57
instance.present.and.returnValue(Promise.resolve());
6-
8+
79
instance.dismiss.and.callFake(() => {
810
_dismissCallback();
911
return Promise.resolve();

‎src/angular/nav-controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import {Observable} from 'rxjs/Observable';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { Observable } from 'rxjs/Observable';
23
import { ViewControllerMock } from './view-controller';
34

45
export class NavControllerMock {
56

67
public static instance(): any {
78

8-
let instance: any = jasmine.createSpyObj('NavController', [
9+
let instance: any = createSpyObj('NavController', [
910
'goToRoot',
1011
'initPane',
1112
'paneChanged',

‎src/angular/nav-params.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class NavParamsMock {
24
public static instance(getReturn?: any): any {
3-
let instance = jasmine.createSpyObj('NavParams', ['get']);
5+
let instance = createSpyObj('NavParams', ['get']);
46
instance.get.and.returnValue(getReturn);
57

68
return instance;

‎src/angular/platform.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class PlatformMock {
24
public static instance(): any {
35

4-
let instance = jasmine.createSpyObj('Platform', [
6+
let instance = createSpyObj('Platform', [
57
'dir',
68
'getQueryParam',
79
'height',

‎src/angular/popover-controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import {PopoverMock} from './popover';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { PopoverMock } from './popover';
23

34
export class PopoverControllerMock {
45
public static instance(popOver?: PopoverMock): any {
56

6-
let instance = jasmine.createSpyObj('PopoverController', ['create']);
7+
let instance = createSpyObj('PopoverController', ['create']);
78
instance.create.and.returnValue(popOver || PopoverMock.instance());
89

910
return instance;

‎src/angular/popover.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class PopoverMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('Popover', ['present', 'dismissAll', 'setContent', 'setSpinner']);
5+
let instance = createSpyObj('Popover', ['present', 'dismissAll', 'setContent', 'setSpinner']);
46
instance.present.and.returnValue(Promise.resolve());
57

68
return instance;

‎src/angular/slides.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class SlidesMock {
24
public static instance(): any {
35

4-
let instance = jasmine.createSpyObj('Slides', [
6+
let instance = createSpyObj('Slides', [
57
'controlBy',
68
'controlInverse',
79
'enableKeyboardControl',

‎src/angular/tab.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class TabMock {
24
public static instance(): any {
3-
return jasmine.createSpyObj('Tab', ['linker']);
5+
return createSpyObj('Tab', ['linker']);
46
}
57
}

‎src/angular/tabs.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import {TabMock} from './tab';
1+
import { TabMock } from './tab';
2+
import { createSpyObj } from '../utilities/create-spy';
23

34
export class TabsMock {
45
public static instance(defaultTab?: TabMock, selectedTab?: TabMock, previousTab?: TabMock): any {
5-
let instance = jasmine.createSpyObj('Tabs', [
6+
let instance = createSpyObj('Tabs', [
67
'select',
78
'getSelected',
89
'ngOnDestroy',

‎src/angular/toast-controller.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import {ToastMock} from './toast';
1+
import { createSpyObj } from '../utilities/create-spy';
2+
import { ToastMock } from './toast';
23

34
export class ToastControllerMock {
45
public static instance(toast?: ToastMock): any {
56

6-
let instance = jasmine.createSpyObj('ToastController', ['create']);
7+
let instance = createSpyObj('ToastController', ['create']);
78
instance.create.and.returnValue(toast || ToastMock.instance());
89

910
return instance;

‎src/angular/toast.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class ToastMock {
24
public static instance(): any {
3-
let instance = jasmine.createSpyObj('Toast', ['present', 'dismissAll', 'setContent', 'setSpinner']);
5+
let instance = createSpyObj('Toast', ['present', 'dismissAll', 'setContent', 'setSpinner']);
46
instance.present.and.returnValue(Promise.resolve());
57

68
return instance;

‎src/angular/view-controller.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import { Observable } from 'rxjs';
2-
import { NavParamsMock } from './nav-params';
3-
import { NavControllerMock } from './nav-controller';
1+
import { Observable } from 'rxjs';
2+
import { NavParamsMock } from './nav-params';
3+
import { NavControllerMock } from './nav-controller';
4+
import { createSpyObj } from '../utilities/create-spy';
45

56
export class ViewControllerMock {
67
private static staticInstance: any = null;
78

8-
//HACK- https://github.com/stonelasley/ionic-mocks/issues/29
9+
// HACK- https://github.com/stonelasley/ionic-mocks/issues/29
910
private static navController(): any {
10-
let instance: any = jasmine.createSpyObj('NavController', [
11+
let instance: any = createSpyObj('NavController', [
1112
'goToRoot',
1213
'initPane',
1314
'paneChanged',
@@ -96,7 +97,7 @@ export class ViewControllerMock {
9697

9798
public static instance(): any {
9899

99-
let instance = jasmine.createSpyObj('ViewController', [
100+
let instance = createSpyObj('ViewController', [
100101
'willEnter',
101102
'didEnter',
102103
'willLeave',

‎src/ionic/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import { StorageMock } from './storage';
22

33
export {
44
StorageMock
5-
}
5+
};

‎src/ionic/storage.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class StorageMock {
2-
public static instance(key:any = 'key1', value: any = 'value1'): any {
4+
public static instance(key: any = 'key1', value: any = 'value1'): any {
35

4-
let instance = jasmine.createSpyObj('Storage', [
6+
let instance = createSpyObj('Storage', [
57
'driver',
68
'ready',
79
'get',

‎src/native/google-analytics.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { createSpyObj } from '../utilities/create-spy';
2+
13
export class GoogleAnalyticsMock {
24

35
public static instance(): any {
4-
let instance = jasmine.createSpyObj('GoogleAnalytics', [
6+
let instance = createSpyObj('GoogleAnalytics', [
57
'startTrackerWithId',
68
'setAllowIDFACollection',
79
'setUserId',

‎src/native/keyboard.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { Observable } from 'rxjs/Observable';
2+
import { createSpyObj } from '../utilities/create-spy';
23

34
export class KeyboardMock {
45
public static instance(): any {
5-
let instance = jasmine.createSpyObj('Keyboard', [
6+
let instance = createSpyObj('Keyboard', [
67
'hideKeyboardAccessoryBar',
78
'show',
89
'close',

0 commit comments

Comments
 (0)