upgrading to ionic beta.10

lathonez · Jun 29, 2016 · 1b1b2e3 · 1b1b2e3
1 parent b57ed88
commit 1b1b2e3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 ### Features
 
 * **Unit Test**: Implement Barrels and move mocks to individual files PR [#109](https://github.com/lathonez/clicker/pull/109) ([0734e45](https://github.com/lathonez/clicker/commit/0734e45))
-* **Update**: Update to Ionic 2.0.0.beta.10 ([TODO](https://github.com/lathonez/clicker/commit/))
+* **Update**: Update to Ionic 2.0.0.beta.10 ([b57ed88](https://github.com/lathonez/clicker/commit/b57ed88))
 
 <a name="1.3.4"></a>
 # 1.3.4 (2016-06-19)

diff --git a/app/app.spec.ts b/app/app.spec.ts
@@ -1,17 +1,14 @@
-import { ADDITIONAL_TEST_BROWSER_PROVIDERS, TEST_BROWSER_STATIC_PLATFORM_PROVIDERS } from '@angular/platform-browser/testing/browser_static';
-import { BROWSER_APP_DYNAMIC_PROVIDERS }                from '@angular/platform-browser-dynamic';
-import { resetBaseTestProviders, setBaseTestProviders } from '@angular/core/testing';
+import {
+  TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS,
+  TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+} from '@angular/platform-browser-dynamic/testing';
+
+// import { BROWSER_APP_DYNAMIC_PROVIDERS }                from '@angular/platform-browser-dynamic';
+import { setBaseTestProviders } from '@angular/core/testing';
 import { ClickerApp }                                   from './app';
 import { Page2 }                                        from './pages/page2/page2';
 
-resetBaseTestProviders();
-setBaseTestProviders(
-  TEST_BROWSER_STATIC_PLATFORM_PROVIDERS,
-  [
-    BROWSER_APP_DYNAMIC_PROVIDERS,
-    ADDITIONAL_TEST_BROWSER_PROVIDERS,
-  ]
-);
+setBaseTestProviders(TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
 
 let clickerApp: ClickerApp = null;
 

diff --git a/app/components/clickerForm/clickerForm.spec.ts b/app/components/clickerForm/clickerForm.spec.ts
@@ -20,7 +20,7 @@ describe('ClickerForm', () => {
   });
 
   beforeEachProviders(() => providers.concat(clickerFormProviders));
-  beforeEach(injectAsyncWrapper(asyncCallbackFactory(ClickerForm, this, false, beforeEachFn)));
+  beforeEach(injectAsyncWrapper(asyncCallbackFactory(ClickerForm, this, true, beforeEachFn)));
 
   it('initialises', () => {
     expect(this.fixture).not.toBeNull();
@@ -33,8 +33,6 @@ describe('ClickerForm', () => {
     let button: any = this.fixture.nativeElement.querySelectorAll('button')[1];
     spyOn(Utils, 'resetControl').and.callThrough();
     input.value = clickerName;
-    this.fixture.detectChanges();
-    this.instance['clickerNameInput']['updateValue'](clickerName, true);
     TestUtils.eventFire(input, 'input');
     TestUtils.eventFire(button, 'click');
     expect(this.instance.newClicker).toHaveBeenCalledWith(Object({ clickerNameInput: clickerName }));

diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "isparta": "4.0.0",
     "jasmine-core": "2.4.1",
     "jasmine-spec-reporter": "2.5.0",
-    "karma": "1.1.0",
+    "karma": "0.13.22",
     "karma-browserify": "5.0.5",
     "karma-chrome-launcher": "1.0.1",
     "karma-coverage": "1.0.0",