diff --git a/app/modules/epics/related-userstories/related-userstories-controller.coffee b/app/modules/epics/related-userstories/related-userstories-controller.coffee index 4b9be953..0ab2fd1f 100644 --- a/app/modules/epics/related-userstories/related-userstories-controller.coffee +++ b/app/modules/epics/related-userstories/related-userstories-controller.coffee @@ -20,18 +20,20 @@ module = angular.module("taigaEpics") class RelatedUserStoriesController - @.$inject = ["tgResources", "tgEpicsService"] + @.$inject = ["tgEpicsService"] - constructor: (@rs, @epicsService) -> + constructor: (@epicsService) -> @.sectionName = "Epics" @.showCreateRelatedUserstoriesLightbox = false loadRelatedUserstories: () -> - @rs.userstories.listInEpic(@.epic.get('id')).then (data) => - @.userstories = data + @epicsService.listRelatedUserStories(@.epic) + .then (userstories) => + @.userstories = userstories reorderRelatedUserstory: (us, newIndex) -> - @epicsService.reorderRelatedUserstory(@.epic, @.userstories, us, newIndex).then (userstories) => - @.userstories = userstories + @epicsService.reorderRelatedUserstory(@.epic, @.userstories, us, newIndex) + .then (userstories) => + @.userstories = userstories module.controller("RelatedUserStoriesCtrl", RelatedUserStoriesController) diff --git a/app/modules/epics/related-userstories/related-userstories.controller.spec.coffee b/app/modules/epics/related-userstories/related-userstories.controller.spec.coffee index 2543b085..30611140 100644 --- a/app/modules/epics/related-userstories/related-userstories.controller.spec.coffee +++ b/app/modules/epics/related-userstories/related-userstories.controller.spec.coffee @@ -23,17 +23,9 @@ describe "RelatedUserStories", -> controller = null mocks = {} - _mockTgResources = () -> - mocks.tgResources = { - userstories: { - listInEpic: sinon.stub() - } - } - - provide.value "tgResources", mocks.tgResources - _mockTgEpicsService = () -> mocks.tgEpicsService = { + listRelatedUserStories: sinon.stub() reorderRelatedUserstory: sinon.stub() } @@ -42,7 +34,6 @@ describe "RelatedUserStories", -> _mocks = () -> module ($provide) -> provide = $provide - _mockTgResources() _mockTgEpicsService() return null @@ -66,7 +57,11 @@ describe "RelatedUserStories", -> id: 66 }) - promise = mocks.tgResources.userstories.listInEpic.withArgs(66).promise().resolve(userstories) + promise = mocks.tgEpicsService.listRelatedUserStories + .withArgs(ctrl.epic) + .promise() + .resolve(userstories) + ctrl.loadRelatedUserstories().then () -> expect(ctrl.userstories).is.equal(userstories) done() @@ -95,7 +90,6 @@ describe "RelatedUserStories", -> id: 66 }) - promise = mocks.tgEpicsService.reorderRelatedUserstory .withArgs(ctrl.epic, ctrl.userstories, userstories.get(1), 0) .promise()