diff --git a/app/modules/home/home.service.spec.coffee b/app/modules/home/home.service.spec.coffee index e174608f..776cac40 100644 --- a/app/modules/home/home.service.spec.coffee +++ b/app/modules/home/home.service.spec.coffee @@ -9,9 +9,9 @@ describe "tgHome", -> mocks.resources.tasks = {} mocks.resources.issues = {} - mocks.resources.userstories.listInAllProjects = sinon.stub().promise() - mocks.resources.tasks.listInAllProjects = sinon.stub().promise() - mocks.resources.issues.listInAllProjects = sinon.stub().promise() + mocks.resources.userstories.listInAllProjects = sinon.stub() + mocks.resources.tasks.listInAllProjects = sinon.stub() + mocks.resources.issues.listInAllProjects = sinon.stub() provide.value "tgResources", mocks.resources @@ -61,13 +61,13 @@ describe "tgHome", -> {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"}])) - mocks.resources.tasks.listInAllProjects + mocks.resources.tasks.listInAllProjects.promise() .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"}])) # mock urls diff --git a/app/modules/home/working-on/working-on.controller.spec.coffee b/app/modules/home/working-on/working-on.controller.spec.coffee index 9a77d8b2..4ba57e5a 100644 --- a/app/modules/home/working-on/working-on.controller.spec.coffee +++ b/app/modules/home/working-on/working-on.controller.spec.coffee @@ -5,7 +5,7 @@ describe "WorkingOn", -> _mockHomeService = () -> mocks.homeService = { - getWorkInProgress: sinon.stub().promise() + getWorkInProgress: sinon.stub() } $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") diff --git a/app/modules/profile/profile-bar/profile-bar.controller.spec.coffee b/app/modules/profile/profile-bar/profile-bar.controller.spec.coffee index f435acd0..abf2a69e 100644 --- a/app/modules/profile/profile-bar/profile-bar.controller.spec.coffee +++ b/app/modules/profile/profile-bar/profile-bar.controller.spec.coffee @@ -6,7 +6,7 @@ describe "ProfileBar", -> _mockUserService = () -> mocks.userService = { - getStats: sinon.stub().promise() + getStats: sinon.stub() } provide.value "tgUserService", mocks.userService @@ -37,7 +37,7 @@ describe "ProfileBar", -> {id: 3} ]) - mocks.userService.getStats.withArgs(userId).resolve(stats) + mocks.userService.getStats.withArgs(userId).promise().resolve(stats) $scope = $rootScope.$new diff --git a/app/modules/profile/profile-contacts/profile-contacts.controller.spec.coffee b/app/modules/profile/profile-contacts/profile-contacts.controller.spec.coffee index 33c13b2a..ba05bd41 100644 --- a/app/modules/profile/profile-contacts/profile-contacts.controller.spec.coffee +++ b/app/modules/profile/profile-contacts/profile-contacts.controller.spec.coffee @@ -6,7 +6,7 @@ describe "ProfileContacts", -> _mockUserService = () -> mocks.userServices = { - getContacts: sinon.stub().promise() + getContacts: sinon.stub() } provide.value "tgUserService", mocks.userServices @@ -36,7 +36,7 @@ describe "ProfileContacts", -> {id: 3} ] - mocks.userServices.getContacts.withArgs(userId).resolve(contacts) + mocks.userServices.getContacts.withArgs(userId).promise().resolve(contacts) $scope = $rootScope.$new() diff --git a/app/modules/profile/profile-projects/profile-projects.controller.spec.coffee b/app/modules/profile/profile-projects/profile-projects.controller.spec.coffee index 44f70b6f..2461a1b3 100644 --- a/app/modules/profile/profile-projects/profile-projects.controller.spec.coffee +++ b/app/modules/profile/profile-projects/profile-projects.controller.spec.coffee @@ -13,7 +13,7 @@ describe "ProfileProjects", -> _mockProjectsService = () -> mocks.projectsService = { - getProjectsByUserId: sinon.stub().promise() + getProjectsByUserId: sinon.stub() } provide.value "tgProjectsService", mocks.projectsService @@ -60,7 +60,7 @@ describe "ProfileProjects", -> {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) $scope = $rootScope.$new() diff --git a/app/modules/profile/profile.controller.spec.coffee b/app/modules/profile/profile.controller.spec.coffee index c919f9e5..67b2fd1e 100644 --- a/app/modules/profile/profile.controller.spec.coffee +++ b/app/modules/profile/profile.controller.spec.coffee @@ -32,7 +32,7 @@ describe "ProfileController", -> stub = sinon.stub() mocks.userService = { - getUserByUserName: sinon.stub().promise() + getUserByUserName: sinon.stub() } provide.value "tgUserService", mocks.userService @@ -70,13 +70,13 @@ describe "ProfileController", -> mocks.routeParams.slug = "user-slug" - ctrl = $controller("Profile") - user = Immutable.fromJS({ 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 ( -> expect(ctrl.user).to.be.equal(user) diff --git a/app/modules/profile/profile.scss b/app/modules/profile/profile.scss index 0625bb67..cc133829 100644 --- a/app/modules/profile/profile.scss +++ b/app/modules/profile/profile.scss @@ -13,6 +13,7 @@ .timeline-wrapper { background: lighten($whitish, 10%); margin-right: 3.5rem; + width: 768px; > div { opacity: 1; padding-top: 0; diff --git a/app/modules/projects/projects.service.spec.coffee b/app/modules/projects/projects.service.spec.coffee index 531029f4..fbaee2fd 100644 --- a/app/modules/projects/projects.service.spec.coffee +++ b/app/modules/projects/projects.service.spec.coffee @@ -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"}}) mocks.resources.projects = {} - mocks.resources.projects.getProjectBySlug = sinon.stub().promise() - mocks.resources.projects.getProjectBySlug.withArgs(projectSlug).resolve(project) + mocks.resources.projects.getProjectBySlug = sinon.stub() + mocks.resources.projects.getProjectBySlug.withArgs(projectSlug).promise().resolve(project) projectsService.getProjectBySlug(projectSlug).then (project) -> expect(project.toJS()).to.be.eql( @@ -126,8 +126,8 @@ describe "tgProjectsService", -> ]) mocks.resources.projects = {} - mocks.resources.projects.getProjectsByUserId = sinon.stub().promise() - mocks.resources.projects.getProjectsByUserId.withArgs(projectId).resolve(projects) + mocks.resources.projects.getProjectsByUserId = sinon.stub() + mocks.resources.projects.getProjectsByUserId.withArgs(projectId).promise().resolve(projects) projectsService.getProjectsByUserId(projectId).then (projects) -> expect(projects.toJS()).to.be.eql([{ diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee index 8d47a599..ab8ea8f5 100644 --- a/app/modules/services/current-user.service.spec.coffee +++ b/app/modules/services/current-user.service.spec.coffee @@ -11,8 +11,8 @@ describe "tgCurrentUserService", -> _mockProjectsService = () -> mocks.projectsService = { - getProjectsByUserId: sinon.stub().promise(), - bulkUpdateProjectsOrder: sinon.stub().promise() + getProjectsByUserId: sinon.stub() + bulkUpdateProjectsOrder: sinon.stub() } provide.value "tgProjectsService", mocks.projectsService @@ -65,8 +65,8 @@ describe "tgCurrentUserService", -> {id: 5, name: "fake5"} ]) - mocks.projectsService.getProjectsByUserId = sinon.stub().promise() - mocks.projectsService.getProjectsByUserId.withArgs(user.get("id")).resolve(projects) + mocks.projectsService.getProjectsByUserId = sinon.stub() + mocks.projectsService.getProjectsByUserId.withArgs(user.get("id")).promise().resolve(projects) currentUserService.setUser(user).then () -> expect(currentUserService._user).to.be.equal(user) @@ -82,7 +82,7 @@ describe "tgCurrentUserService", -> currentUserService._loadProjects = sinon.spy() - mocks.projectsService.bulkUpdateProjectsOrder.withArgs(fakeData).resolve() + mocks.projectsService.bulkUpdateProjectsOrder.withArgs(fakeData).promise().resolve() currentUserService.bulkUpdateProjectsOrder(fakeData).then () -> expect(currentUserService._loadProjects).to.be.callOnce diff --git a/app/modules/services/project.service.spec.coffee b/app/modules/services/project.service.spec.coffee index 8e430631..4b42cc4a 100644 --- a/app/modules/services/project.service.spec.coffee +++ b/app/modules/services/project.service.spec.coffee @@ -5,7 +5,7 @@ describe "tgProjectService", -> _mockProjectsService = () -> mocks.projectsService = { - getProjectBySlug: sinon.stub().promise() + getProjectBySlug: sinon.stub() } $provide.value "tgProjectsService", mocks.projectsService @@ -69,7 +69,7 @@ describe "tgProjectService", -> projectService._pslug = pslug - mocks.projectsService.getProjectBySlug.withArgs(pslug).resolve(project) + mocks.projectsService.getProjectBySlug.withArgs(pslug).promise().resolve(project) projectService.fetchProject().then () -> expect(projectService.project).to.be.equal(project) diff --git a/app/modules/services/user.service.spec.coffee b/app/modules/services/user.service.spec.coffee index 71384243..eb8156a7 100644 --- a/app/modules/services/user.service.spec.coffee +++ b/app/modules/services/user.service.spec.coffee @@ -60,8 +60,8 @@ describe "UserService", -> {id: 3, name: "fake3"} ]) - mocks.resources.users.getContacts = sinon.stub().promise() - mocks.resources.users.getContacts.withArgs(userId).resolve(contacts) + mocks.resources.users.getContacts = sinon.stub() + mocks.resources.users.getContacts.withArgs(userId).promise().resolve(contacts) userService.attachUserContactsToProjects(userId, projects).then (_projects_) -> contacts = _projects_.get(0).get("contacts") @@ -79,8 +79,8 @@ describe "UserService", -> {id: 3} ] - mocks.resources.users.getContacts = sinon.stub().promise() - mocks.resources.users.getContacts.withArgs(userId).resolve(contacts) + mocks.resources.users.getContacts = sinon.stub() + mocks.resources.users.getContacts.withArgs(userId).promise().resolve(contacts) userService.getContacts(userId).then (_contacts_) -> expect(_contacts_).to.be.eql(contacts) @@ -93,8 +93,8 @@ describe "UserService", -> user = {id: 1} - mocks.resources.users.getUserByUsername = sinon.stub().promise() - mocks.resources.users.getUserByUsername.withArgs(username).resolve(user) + mocks.resources.users.getUserByUsername = sinon.stub() + mocks.resources.users.getUserByUsername.withArgs(username).promise().resolve(user) userService.getUserByUserName(username).then (_user_) -> expect(_user_).to.be.eql(user)