Merge pull request #1 from lathonez/master

Synching from orig

CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="2.13.0"></a>
+# 2.13.0 (2017-04-25)
+
+### Features
+
+* **Unit**: Improve test coverage [#243](https://github.com/lathonez/clicker/pull/243) ([3e2551f](https://github.com/lathonez/clicker/commit/3e2551f))
+
 <a name="2.12.1"></a>
 # 2.12.1 (2017-04-20)
 

package.json

@@ -15,7 +15,7 @@
     "test-coverage": "ng test --code-coverage",
     "test-ci": "ng test --watch=false --code-coverage"
   },
-  "version": "2.12.1",
+  "version": "2.13.0",
   "dependencies": {
     "@angular/common": "4.0.0",
     "@angular/compiler": "4.0.0",

src/pages/page2/page2.spec.ts

@@ -29,6 +29,7 @@ describe('Pages: Page2', () => {
       fixture = TestBed.createComponent(Page2);
       instance = fixture;
       fixture.detectChanges();
+      fixture.componentInstance.onGainChange();
     });
   }));
 

src/services/clickers.spec.ts

@@ -59,6 +59,14 @@ describe('ClickersService', () => {
     expect(clickedClicker.getCount()).toEqual(1);
   });
 
+  it('loads empty list if given no argument', (done: Function) => {
+    clickers['initIds'](false)
+      .then((ids: Array<string>) => {
+        expect(ids).toEqual([]);
+        done();
+      });
+  });
+
   it('loads IDs from storage', (done: Function) => {
     clickers['initIds']()
       .then((ids: Array<string>) => {

src/services/clickers.ts

@@ -29,10 +29,10 @@ export class ClickersService {
   }
 
   // initialise Ids from SQL storage
-  private initIds(): Promise<{}> {
+  private initIds(load = true): Promise<{}> {
     return this.storage.get('ids') // return the promise so we can chain initClickers
       .then((rawIds: string) => {
-        if (!rawIds) return [];
+        if (!rawIds || !load) return [];
         // ids are stored as stringified JSON array
         return JSON.parse(rawIds);
       });

src/services/storage.spec.ts

@@ -6,7 +6,6 @@ let storage: StorageService = null;
 describe('StorageService', () => {
 
   beforeEach(() => {
-    spyOn(StorageService, 'initStorage').and.returnValue(new StorageMock());
     storage = new StorageService();
     spyOn(storage['storage'], 'get').and.callThrough();
     spyOn(storage['storage'], 'set').and.callThrough();