Use tgEpicsService instead of tgResources

stable
David Barragán Merino 2016-09-09 08:27:01 +02:00
parent fb6b1ec095
commit 802344104e
2 changed files with 14 additions and 18 deletions

View File

@ -20,18 +20,20 @@
module = angular.module("taigaEpics") module = angular.module("taigaEpics")
class RelatedUserStoriesController class RelatedUserStoriesController
@.$inject = ["tgResources", "tgEpicsService"] @.$inject = ["tgEpicsService"]
constructor: (@rs, @epicsService) -> constructor: (@epicsService) ->
@.sectionName = "Epics" @.sectionName = "Epics"
@.showCreateRelatedUserstoriesLightbox = false @.showCreateRelatedUserstoriesLightbox = false
loadRelatedUserstories: () -> loadRelatedUserstories: () ->
@rs.userstories.listInEpic(@.epic.get('id')).then (data) => @epicsService.listRelatedUserStories(@.epic)
@.userstories = data .then (userstories) =>
@.userstories = userstories
reorderRelatedUserstory: (us, newIndex) -> reorderRelatedUserstory: (us, newIndex) ->
@epicsService.reorderRelatedUserstory(@.epic, @.userstories, us, newIndex).then (userstories) => @epicsService.reorderRelatedUserstory(@.epic, @.userstories, us, newIndex)
.then (userstories) =>
@.userstories = userstories @.userstories = userstories
module.controller("RelatedUserStoriesCtrl", RelatedUserStoriesController) module.controller("RelatedUserStoriesCtrl", RelatedUserStoriesController)

View File

@ -23,17 +23,9 @@ describe "RelatedUserStories", ->
controller = null controller = null
mocks = {} mocks = {}
_mockTgResources = () ->
mocks.tgResources = {
userstories: {
listInEpic: sinon.stub()
}
}
provide.value "tgResources", mocks.tgResources
_mockTgEpicsService = () -> _mockTgEpicsService = () ->
mocks.tgEpicsService = { mocks.tgEpicsService = {
listRelatedUserStories: sinon.stub()
reorderRelatedUserstory: sinon.stub() reorderRelatedUserstory: sinon.stub()
} }
@ -42,7 +34,6 @@ describe "RelatedUserStories", ->
_mocks = () -> _mocks = () ->
module ($provide) -> module ($provide) ->
provide = $provide provide = $provide
_mockTgResources()
_mockTgEpicsService() _mockTgEpicsService()
return null return null
@ -66,7 +57,11 @@ describe "RelatedUserStories", ->
id: 66 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 () -> ctrl.loadRelatedUserstories().then () ->
expect(ctrl.userstories).is.equal(userstories) expect(ctrl.userstories).is.equal(userstories)
done() done()
@ -95,7 +90,6 @@ describe "RelatedUserStories", ->
id: 66 id: 66
}) })
promise = mocks.tgEpicsService.reorderRelatedUserstory promise = mocks.tgEpicsService.reorderRelatedUserstory
.withArgs(ctrl.epic, ctrl.userstories, userstories.get(1), 0) .withArgs(ctrl.epic, ctrl.userstories, userstories.get(1), 0)
.promise() .promise()