test(asyncpipe): fix failing tests

Author: nivekcode

projects/ng-sortgrid/src/lib/ngsg-item.directive.spec.ts

@@ -19,32 +19,14 @@ describe('NgsgItemDirective', () => {
     ['selectElementIfNoSelection', 'updateSelectedDragItem']);
   const ngsgReflectService = createSpyObj<NgsgReflectService>('ngsgReflectService', ['reflectChanges']);
   const ngsgStore = createSpyObj<NgsgStoreService>('ngsgStore',
-    ['initState', 'hasSelectedItems', 'resetSelectedItems']);
+    ['initState', 'hasSelectedItems', 'resetSelectedItems', 'hasGroup', 'hasItems', 'setItems']);
   const ngsgEventService = new NgsgEventsService();
 
   beforeEach(() => {
     sut = new NgsgItemDirective(elementRef, ngsgSortService, ngsgSelectionService,
       ngsgReflectService, ngsgStore, ngsgEventService);
   });
 
-  it('should log a warning if we do not pass in sort grid items', () => {
-    const consoleWarnSpy = spyOn(global.console, 'warn');
-    sut.ngOnInit();
-    expect(consoleWarnSpy).toHaveBeenCalledWith(
-      `Ng-sortgrid: No items provided - please use [sortGridItems] to pass in an array of items -
-      otherwhise the ordered items will not be emitted in the (sorted) event`);
-  });
-
-  it('should init the store with the sortGridGroup, the ngSortGridItems and the classes', () => {
-    const sortGridGroup = 'sortgridgroup';
-    const sortGridItems = ['item one', 'item two', 'item three'] as any;
-    sut.ngSortGridItems = sortGridItems;
-    sut.ngSortGridGroup = sortGridGroup;
-
-    sut.ngOnInit();
-    expect(ngsgStore.initState).toHaveBeenCalledWith(sortGridGroup, sortGridItems, {});
-  });
-
   it('should set the draggable attribute on the elment', () => {
     sut.ngAfterViewInit();
     expect((elementRef.nativeElement as any).draggable).toBeTruthy();
@@ -133,6 +115,7 @@ describe('NgsgItemDirective', () => {
 
   it('should sort if the group contains selectedItems', () => {
     ngsgStore.hasSelectedItems.and.returnValue(true);
+    ngsgStore.hasItems.and.returnValue(true);
     sut.drop({target: {matches: () => true}});
     expect(ngsgSortService.endSort).toHaveBeenCalled();
   });
@@ -169,6 +152,7 @@ describe('NgsgItemDirective', () => {
     const reflectedChanges = ['item two', 'item one', 'item three'];
 
     ngsgStore.hasSelectedItems.and.returnValue(true);
+    ngsgStore.hasItems.and.returnValue(true);
     ngsgReflectService.reflectChanges.and.returnValue(reflectedChanges);
     sut.ngSortGridGroup = group;
 
@@ -212,4 +196,58 @@ describe('NgsgItemDirective', () => {
     expect(ngsgSelectionService.updateSelectedDragItem).toHaveBeenCalledWith(group, host, true);
   });
 
+  it(`should init the state with empty items if group has yet not been
+  initialized and the currentValue is null`, () => {
+    const group = 'test-group';
+    const changes = {
+      ngSortGridItems: {
+        currentValue: null
+      }
+    } as any;
+    sut.ngSortGridGroup = group;
+    ngsgStore.hasGroup.and.returnValue(false);
+
+    sut.ngOnChanges(changes);
+    expect(ngsgStore.initState).toHaveBeenCalledWith(group, []);
+  });
+
+  it('should init the state with items from the currentValue if group has yet not been initialized', () => {
+    const group = 'test-group';
+    const changes = {
+      ngSortGridItems: {
+        currentValue: null
+      }
+    } as any;
+    sut.ngSortGridGroup = group;
+    ngsgStore.hasGroup.and.returnValue(false);
+
+    sut.ngOnChanges(changes);
+    expect(ngsgStore.initState).toHaveBeenCalledWith(group, []);
+  });
+
+  it('should set the items if the group has allready been initialized', () => {
+    const group = 'test-group';
+    const items = ['Item one', 'item two'];
+    const changes = {
+      ngSortGridItems: {
+        currentValue: items
+      }
+    } as any;
+    sut.ngSortGridGroup = group;
+    ngsgStore.hasGroup.and.returnValue(true);
+
+    sut.ngOnChanges(changes);
+    expect(ngsgStore.setItems).toHaveBeenCalledWith(group, items);
+  });
+
+  it('should log a warning message if you drop and you did not provide any items', () => {
+    const expectedWarniningMessage = `Ng-sortgrid: No items provided - please use [sortGridItems] to pass in an array of items -
+      otherwhise the ordered items can not be emitted in the (sorted) event`;
+    const consoleWarnSpy = spyOn(console, 'warn');
+    ngsgStore.hasItems.and.returnValue(false);
+
+    sut.drop(event);
+    expect(consoleWarnSpy).toHaveBeenCalledWith(expectedWarniningMessage);
+  });
+
 });

projects/ng-sortgrid/src/lib/ngsg-store.service.spec.ts

@@ -29,6 +29,37 @@ describe('NgsgStoreService', () => {
       expect(sut.getItems(group)).toEqual([]);
     });
 
+    it('should return false if the group does not contain items', () => {
+      const group = 'testgroup';
+      sut.initState(group);
+
+      const hasItems = sut.hasItems(group);
+      expect(hasItems).toBeFalsy();
+    });
+
+    it('should return true if the group contains items', () => {
+      const group = 'testgroup';
+      sut.initState(group, ['item one', 'item two']);
+
+      const hasItems = sut.hasItems(group);
+      expect(hasItems).toBeTruthy();
+    });
+
+    it('should return false if the current group has yet not been initialized', () => {
+      const group = 'testgroup';
+
+      const hasGroup = sut.hasGroup(group);
+      expect(hasGroup).toBeFalsy();
+    });
+
+    it('should return true if the current group has been initialized', () => {
+      const group = 'testgroup';
+      sut.initState(group);
+
+      const hasGroup = sut.hasGroup(group);
+      expect(hasGroup).toBeTruthy();
+    });
+
     it('should add the classes to the group', () => {
       const group = 'testgroup';
       const items = ['Item1', 'Item2'];

projects/ng-sortgrid/src/lib/ngsg-store.service.ts

@@ -29,7 +29,6 @@ export class NgsgStoreService {
   }
 
   public setItems(group: string, items: any): void {
-    console.log('Items', items);
     this.state.get(group).items = [...items];
   }