taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix promise lib use in tests

stable
Juanfran 2015-05-27 15:24:50 +02:00
parent 61d3667b73
commit 0963b6ead0
11 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/modules/home/home.service.spec.coffee
View File

@ -9,9 +9,9 @@ describe "tgHome", ->
mocks.resources.tasks = {} mocks.resources.tasks = {}
mocks.resources.issues = {} mocks.resources.issues = {}
mocks.resources.userstories.listInAllProjects = sinon.stub().promise() mocks.resources.userstories.listInAllProjects = sinon.stub()
mocks.resources.tasks.listInAllProjects = sinon.stub().promise() mocks.resources.tasks.listInAllProjects = sinon.stub()
mocks.resources.issues.listInAllProjects = sinon.stub().promise() mocks.resources.issues.listInAllProjects = sinon.stub()
provide.value "tgResources", mocks.resources provide.value "tgResources", mocks.resources
@ -61,13 +61,13 @@ describe "tgHome", ->
{id: 2, name: "fake2", slug: "project-2"} {id: 2, name: "fake2", slug: "project-2"}
])) ]))
mocks.resources.userstories.listInAllProjects mocks.resources.userstories.listInAllProjects.promise()
.resolve(Immutable.fromJS([{id: 1, ref: 1, project: "1"}])) .resolve(Immutable.fromJS([{id: 1, ref: 1, project: "1"}]))
mocks.resources.tasks.listInAllProjects mocks.resources.tasks.listInAllProjects.promise()
.resolve(Immutable.fromJS([{id: 2, ref: 2, project: "1"}])) .resolve(Immutable.fromJS([{id: 2, ref: 2, project: "1"}]))
mocks.resources.issues.listInAllProjects mocks.resources.issues.listInAllProjects.promise()
.resolve(Immutable.fromJS([{id: 3, ref: 3, project: "1"}])) .resolve(Immutable.fromJS([{id: 3, ref: 3, project: "1"}]))
# mock urls # mock urls

4
app/modules/home/working-on/working-on.controller.spec.coffee
View File

@ -5,7 +5,7 @@ describe "WorkingOn", ->
_mockHomeService = () -> _mockHomeService = () ->
mocks.homeService = { mocks.homeService = {
getWorkInProgress: sinon.stub().promise() getWorkInProgress: sinon.stub()
} }
$provide.value("tgHomeService", mocks.homeService) $provide.value("tgHomeService", mocks.homeService)
@ -43,7 +43,7 @@ describe "WorkingOn", ->
} }
}) })
mocks.homeService.getWorkInProgress.withArgs(userId).resolve(workInProgress) mocks.homeService.getWorkInProgress.withArgs(userId).promise().resolve(workInProgress)
ctrl = $controller("WorkingOn") ctrl = $controller("WorkingOn")

4
app/modules/profile/profile-bar/profile-bar.controller.spec.coffee
View File

@ -6,7 +6,7 @@ describe "ProfileBar", ->
_mockUserService = () -> _mockUserService = () ->
mocks.userService = { mocks.userService = {
getStats: sinon.stub().promise() getStats: sinon.stub()
} }
provide.value "tgUserService", mocks.userService provide.value "tgUserService", mocks.userService
@ -37,7 +37,7 @@ describe "ProfileBar", ->
{id: 3} {id: 3}
]) ])
mocks.userService.getStats.withArgs(userId).resolve(stats) mocks.userService.getStats.withArgs(userId).promise().resolve(stats)
$scope = $rootScope.$new $scope = $rootScope.$new

4
app/modules/profile/profile-contacts/profile-contacts.controller.spec.coffee
View File

@ -6,7 +6,7 @@ describe "ProfileContacts", ->
_mockUserService = () -> _mockUserService = () ->
mocks.userServices = { mocks.userServices = {
getContacts: sinon.stub().promise() getContacts: sinon.stub()
} }
provide.value "tgUserService", mocks.userServices provide.value "tgUserService", mocks.userServices
@ -36,7 +36,7 @@ describe "ProfileContacts", ->
{id: 3} {id: 3}
] ]
mocks.userServices.getContacts.withArgs(userId).resolve(contacts) mocks.userServices.getContacts.withArgs(userId).promise().resolve(contacts)
$scope = $rootScope.$new() $scope = $rootScope.$new()

4
app/modules/profile/profile-projects/profile-projects.controller.spec.coffee
View File

@ -13,7 +13,7 @@ describe "ProfileProjects", ->
_mockProjectsService = () -> _mockProjectsService = () ->
mocks.projectsService = { mocks.projectsService = {
getProjectsByUserId: sinon.stub().promise() getProjectsByUserId: sinon.stub()
} }
provide.value "tgProjectsService", mocks.projectsService provide.value "tgProjectsService", mocks.projectsService
@ -60,7 +60,7 @@ describe "ProfileProjects", ->
{id: 3, contacts: "fake"} {id: 3, contacts: "fake"}
] ]
mocks.projectsService.getProjectsByUserId.withArgs(userId).resolve(projects) mocks.projectsService.getProjectsByUserId.withArgs(userId).promise().resolve(projects)
mocks.userService.attachUserContactsToProjects.withArgs(userId, projects).returns(projectsWithContacts) mocks.userService.attachUserContactsToProjects.withArgs(userId, projects).returns(projectsWithContacts)
$scope = $rootScope.$new() $scope = $rootScope.$new()

8
app/modules/profile/profile.controller.spec.coffee
View File

@ -32,7 +32,7 @@ describe "ProfileController", ->
stub = sinon.stub() stub = sinon.stub()
mocks.userService = { mocks.userService = {
getUserByUserName: sinon.stub().promise() getUserByUserName: sinon.stub()
} }
provide.value "tgUserService", mocks.userService provide.value "tgUserService", mocks.userService
@ -70,13 +70,13 @@ describe "ProfileController", ->
mocks.routeParams.slug = "user-slug" mocks.routeParams.slug = "user-slug"
ctrl = $controller("Profile")
user = Immutable.fromJS({ user = Immutable.fromJS({
full_name: "full-name" full_name: "full-name"
}) })
mocks.userService.getUserByUserName.withArgs(mocks.routeParams.slug).resolve(user) mocks.userService.getUserByUserName.withArgs(mocks.routeParams.slug).promise().resolve(user)
ctrl = $controller("Profile")
setTimeout ( -> setTimeout ( ->
expect(ctrl.user).to.be.equal(user) expect(ctrl.user).to.be.equal(user)

1
app/modules/profile/profile.scss
View File

@ -13,6 +13,7 @@
.timeline-wrapper { .timeline-wrapper {
background: lighten($whitish, 10%); background: lighten($whitish, 10%);
margin-right: 3.5rem; margin-right: 3.5rem;
width: 768px;
> div { > div {
opacity: 1; opacity: 1;
padding-top: 0; padding-top: 0;

8
app/modules/projects/projects.service.spec.coffee
View File

@ -101,8 +101,8 @@ describe "tgProjectsService", ->
project = Immutable.fromJS({id: 2, url: 'url-2', tags: ['xx', 'yy', 'aa'], tags_colors: {xx: "red", yy: "blue", aa: "white"}}) project = Immutable.fromJS({id: 2, url: 'url-2', tags: ['xx', 'yy', 'aa'], tags_colors: {xx: "red", yy: "blue", aa: "white"}})
mocks.resources.projects = {} mocks.resources.projects = {}
mocks.resources.projects.getProjectBySlug = sinon.stub().promise() mocks.resources.projects.getProjectBySlug = sinon.stub()
mocks.resources.projects.getProjectBySlug.withArgs(projectSlug).resolve(project) mocks.resources.projects.getProjectBySlug.withArgs(projectSlug).promise().resolve(project)
projectsService.getProjectBySlug(projectSlug).then (project) -> projectsService.getProjectBySlug(projectSlug).then (project) ->
expect(project.toJS()).to.be.eql( expect(project.toJS()).to.be.eql(
@ -126,8 +126,8 @@ describe "tgProjectsService", ->
]) ])
mocks.resources.projects = {} mocks.resources.projects = {}
mocks.resources.projects.getProjectsByUserId = sinon.stub().promise() mocks.resources.projects.getProjectsByUserId = sinon.stub()
mocks.resources.projects.getProjectsByUserId.withArgs(projectId).resolve(projects) mocks.resources.projects.getProjectsByUserId.withArgs(projectId).promise().resolve(projects)
projectsService.getProjectsByUserId(projectId).then (projects) -> projectsService.getProjectsByUserId(projectId).then (projects) ->
expect(projects.toJS()).to.be.eql([{ expect(projects.toJS()).to.be.eql([{

10
app/modules/services/current-user.service.spec.coffee
View File

@ -11,8 +11,8 @@ describe "tgCurrentUserService", ->
_mockProjectsService = () -> _mockProjectsService = () ->
mocks.projectsService = { mocks.projectsService = {
getProjectsByUserId: sinon.stub().promise(), getProjectsByUserId: sinon.stub()
bulkUpdateProjectsOrder: sinon.stub().promise() bulkUpdateProjectsOrder: sinon.stub()
} }
provide.value "tgProjectsService", mocks.projectsService provide.value "tgProjectsService", mocks.projectsService
@ -65,8 +65,8 @@ describe "tgCurrentUserService", ->
{id: 5, name: "fake5"} {id: 5, name: "fake5"}
]) ])
mocks.projectsService.getProjectsByUserId = sinon.stub().promise() mocks.projectsService.getProjectsByUserId = sinon.stub()
mocks.projectsService.getProjectsByUserId.withArgs(user.get("id")).resolve(projects) mocks.projectsService.getProjectsByUserId.withArgs(user.get("id")).promise().resolve(projects)
currentUserService.setUser(user).then () -> currentUserService.setUser(user).then () ->
expect(currentUserService._user).to.be.equal(user) expect(currentUserService._user).to.be.equal(user)
@ -82,7 +82,7 @@ describe "tgCurrentUserService", ->
currentUserService._loadProjects = sinon.spy() currentUserService._loadProjects = sinon.spy()
mocks.projectsService.bulkUpdateProjectsOrder.withArgs(fakeData).resolve() mocks.projectsService.bulkUpdateProjectsOrder.withArgs(fakeData).promise().resolve()
currentUserService.bulkUpdateProjectsOrder(fakeData).then () -> currentUserService.bulkUpdateProjectsOrder(fakeData).then () ->
expect(currentUserService._loadProjects).to.be.callOnce expect(currentUserService._loadProjects).to.be.callOnce

4
app/modules/services/project.service.spec.coffee
View File

@ -5,7 +5,7 @@ describe "tgProjectService", ->
_mockProjectsService = () -> _mockProjectsService = () ->
mocks.projectsService = { mocks.projectsService = {
getProjectBySlug: sinon.stub().promise() getProjectBySlug: sinon.stub()
} }
$provide.value "tgProjectsService", mocks.projectsService $provide.value "tgProjectsService", mocks.projectsService
@ -69,7 +69,7 @@ describe "tgProjectService", ->
projectService._pslug = pslug projectService._pslug = pslug
mocks.projectsService.getProjectBySlug.withArgs(pslug).resolve(project) mocks.projectsService.getProjectBySlug.withArgs(pslug).promise().resolve(project)
projectService.fetchProject().then () -> projectService.fetchProject().then () ->
expect(projectService.project).to.be.equal(project) expect(projectService.project).to.be.equal(project)

12
app/modules/services/user.service.spec.coffee
View File

@ -60,8 +60,8 @@ describe "UserService", ->
{id: 3, name: "fake3"} {id: 3, name: "fake3"}
]) ])
mocks.resources.users.getContacts = sinon.stub().promise() mocks.resources.users.getContacts = sinon.stub()
mocks.resources.users.getContacts.withArgs(userId).resolve(contacts) mocks.resources.users.getContacts.withArgs(userId).promise().resolve(contacts)
userService.attachUserContactsToProjects(userId, projects).then (_projects_) -> userService.attachUserContactsToProjects(userId, projects).then (_projects_) ->
contacts = _projects_.get(0).get("contacts") contacts = _projects_.get(0).get("contacts")
@ -79,8 +79,8 @@ describe "UserService", ->
{id: 3} {id: 3}
] ]
mocks.resources.users.getContacts = sinon.stub().promise() mocks.resources.users.getContacts = sinon.stub()
mocks.resources.users.getContacts.withArgs(userId).resolve(contacts) mocks.resources.users.getContacts.withArgs(userId).promise().resolve(contacts)
userService.getContacts(userId).then (_contacts_) -> userService.getContacts(userId).then (_contacts_) ->
expect(_contacts_).to.be.eql(contacts) expect(_contacts_).to.be.eql(contacts)
@ -93,8 +93,8 @@ describe "UserService", ->
user = {id: 1} user = {id: 1}
mocks.resources.users.getUserByUsername = sinon.stub().promise() mocks.resources.users.getUserByUsername = sinon.stub()
mocks.resources.users.getUserByUsername.withArgs(username).resolve(user) mocks.resources.users.getUserByUsername.withArgs(username).promise().resolve(user)
userService.getUserByUserName(username).then (_user_) -> userService.getUserByUserName(username).then (_user_) ->
expect(_user_).to.be.eql(user) expect(_user_).to.be.eql(user)