From bc99a1571f3204a350d35d0929a677c2517e8b12 Mon Sep 17 00:00:00 2001
From: Matt Ross <matt.ross@howardcm.com>
Date: Wed, 26 Sep 2018 09:17:38 -0400
Subject: [PATCH] Update unit tests for new Dragula

---
 test/app/board/board.component.spec.ts        |  5 ++-
 .../app/board/column/column.component.spec.ts |  5 ++-
 test/app/mocks.ts                             | 33 ++++++++++++-------
 .../board-admin/board-admin.component.spec.ts |  5 ++-
 test/app/settings/settings.component.spec.ts  |  4 ++-
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/test/app/board/board.component.spec.ts b/test/app/board/board.component.spec.ts
index 57afa0a..ff99909 100644
--- a/test/app/board/board.component.spec.ts
+++ b/test/app/board/board.component.spec.ts
@@ -8,8 +8,8 @@ import { Location } from '@angular/common';
 import { Router } from '@angular/router';
 
 import { BehaviorSubject } from 'rxjs';
-import { DragulaService } from 'ng2-dragula/ng2-dragula';
-import { DragulaModule } from 'ng2-dragula/ng2-dragula';
+import { DragulaService } from 'ng2-dragula/dist';
+import { DragulaModule } from 'ng2-dragula/dist';
 
 import {
   AuthService,
@@ -182,4 +182,3 @@ describe('BoardDisplay', () => {
   });
 
 });
-
diff --git a/test/app/board/column/column.component.spec.ts b/test/app/board/column/column.component.spec.ts
index 49dbd97..d6b3a71 100644
--- a/test/app/board/column/column.component.spec.ts
+++ b/test/app/board/column/column.component.spec.ts
@@ -5,8 +5,8 @@ import { ElementRef } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
 
-import { DragulaService } from 'ng2-dragula/ng2-dragula';
-import { DragulaModule } from 'ng2-dragula/ng2-dragula';
+import { DragulaService } from 'ng2-dragula/dist';
+import { DragulaModule } from 'ng2-dragula/dist';
 
 import { ColumnDisplay } from '../../../../src/app/board/column/column.component';
 import { TaskDisplay } from '../../../../src/app/board/task/task.component';
@@ -440,4 +440,3 @@ describe('ColumnDisplay', () => {
   });
 
 });
-
diff --git a/test/app/mocks.ts b/test/app/mocks.ts
index a747e9a..1154635 100644
--- a/test/app/mocks.ts
+++ b/test/app/mocks.ts
@@ -17,15 +17,23 @@ export class RouterMock {
 
 export class DragulaMock {
   public opts;
-  public dropModel = new BehaviorSubject([
-    {},
-    { id: '1' },
-    { parentNode: { id: '1' } },
-    { parentNode: { id: '1' } }
-  ]);
-  public dragend = {
-    subscribe: (fn) => { fn(); }
-  };
+
+  dropModel () {
+    return {
+      subscribe: (fn) => {
+        fn([
+          {},
+          { id: '1' },
+          { parentNode: { id: '1' } },
+          { parentNode: { id: '1' } }
+        ]);
+      }
+    };
+  }
+
+  dragend () {
+    return { subscribe: (fn) => { fn(); } };
+  }
 
   find () {
     return { drake: {
@@ -33,9 +41,13 @@ export class DragulaMock {
     } };
   }
 
+  removeModel () {
+    return new BehaviorSubject({});
+  }
+
   destroy () {}
 
-  setOptions (name, opts) {
+  createGroup (_, opts) {
     this.opts = opts;
   }
 }
@@ -107,4 +119,3 @@ export class NotificationsServiceMock {
     this.noteAdded.next(note);
   }
 }
-
diff --git a/test/app/settings/board-admin/board-admin.component.spec.ts b/test/app/settings/board-admin/board-admin.component.spec.ts
index ad1e6a8..c51cd24 100644
--- a/test/app/settings/board-admin/board-admin.component.spec.ts
+++ b/test/app/settings/board-admin/board-admin.component.spec.ts
@@ -3,8 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormsModule } from '@angular/forms';
 
-import { DragulaService } from 'ng2-dragula/ng2-dragula';
-import { DragulaModule } from 'ng2-dragula/ng2-dragula';
+import { DragulaService } from 'ng2-dragula/dist';
+import { DragulaModule } from 'ng2-dragula/dist';
 
 import { SharedModule } from '../../../../src/app/shared/shared.module';
 
@@ -301,4 +301,3 @@ describe('BoardAdmin', () => {
   });
 
 });
-
diff --git a/test/app/settings/settings.component.spec.ts b/test/app/settings/settings.component.spec.ts
index 4fea03f..c271b97 100644
--- a/test/app/settings/settings.component.spec.ts
+++ b/test/app/settings/settings.component.spec.ts
@@ -4,6 +4,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormsModule } from '@angular/forms';
 import { Title } from '@angular/platform-browser';
 
+import { DragulaService } from 'ng2-dragula';
+
 import { Settings } from '../../../src/app/settings/settings.component';
 import { SettingsModule } from '../../../src/app/settings/settings.module';
 import { SettingsService } from '../../../src/app/settings/settings.service';
@@ -23,6 +25,7 @@ describe('Settings', () => {
       ],
       providers: [
         Title,
+        DragulaService,
         SettingsService,
         {
           provide: StringsService,
@@ -50,4 +53,3 @@ describe('Settings', () => {
   });
 
 });
-