Merge
This commit is contained in:
commit
6195391cff
@ -8,7 +8,8 @@ import { Location } from '@angular/common';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
import { DragulaService, DragulaModule } from 'ng2-dragula';
|
||||
import { DragulaService } from 'ng2-dragula/dist';
|
||||
import { DragulaModule } from 'ng2-dragula/dist';
|
||||
|
||||
import {
|
||||
AuthService,
|
||||
@ -181,4 +182,3 @@ describe('BoardDisplay', () => {
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
@ -3,7 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
import { DragulaService, DragulaModule } from 'ng2-dragula';
|
||||
import { DragulaService } from 'ng2-dragula/dist';
|
||||
import { DragulaModule } from 'ng2-dragula/dist';
|
||||
|
||||
import { ColumnDisplayComponent } from '../../../../src/app/board/column/column.component';
|
||||
import { TaskDisplayComponent } from '../../../../src/app/board/task/task.component';
|
||||
@ -436,4 +437,3 @@ describe('ColumnDisplay', () => {
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
@ -17,15 +17,6 @@ export class RouterMock {
|
||||
|
||||
export class DragulaMock {
|
||||
public opts: any;
|
||||
public dragend = {
|
||||
subscribe: (fn: any) => { fn(); }
|
||||
};
|
||||
|
||||
find() {
|
||||
return { drake: {
|
||||
containers: []
|
||||
} };
|
||||
}
|
||||
|
||||
dropModel() {
|
||||
return {
|
||||
@ -40,13 +31,23 @@ export class DragulaMock {
|
||||
};
|
||||
}
|
||||
|
||||
destroy() {}
|
||||
|
||||
createGroup(_: string, opts: any) {
|
||||
this.opts = opts;
|
||||
dragend() {
|
||||
return { subscribe: (fn: any) => { fn(); } };
|
||||
}
|
||||
|
||||
setOptions(_: any, opts: any) {
|
||||
find() {
|
||||
return { drake: {
|
||||
containers: []
|
||||
} };
|
||||
}
|
||||
|
||||
removeModel() {
|
||||
return new BehaviorSubject({});
|
||||
}
|
||||
|
||||
destroy() {}
|
||||
|
||||
createGroup(_: any, opts: any) {
|
||||
this.opts = opts;
|
||||
}
|
||||
}
|
||||
@ -118,4 +119,3 @@ export class NotificationsServiceMock {
|
||||
this.noteAdded.next(note);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,7 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
import { DragulaService, DragulaModule } from 'ng2-dragula';
|
||||
import { DragulaService } from 'ng2-dragula/dist';
|
||||
import { DragulaModule } from 'ng2-dragula/dist';
|
||||
|
||||
import { SharedModule } from '../../../../src/app/shared/shared.module';
|
||||
|
||||
@ -294,4 +295,3 @@ describe('BoardAdmin', () => {
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
@ -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 { SettingsComponent } 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', () => {
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
Reference in New Issue
Block a user