From 8457f943235fce78a37f712e81f7c568465c5ccb Mon Sep 17 00:00:00 2001 From: Juanfran Date: Tue, 24 May 2016 09:22:06 +0200 Subject: [PATCH] fix unit tests warning --- .../attachments-full.controller.spec.coffee | 2 +- .../attachments-full/attachments-full.service.coffee | 2 +- .../external-apps/external-app.controller.spec.coffee | 8 +++----- app/modules/profile/profile.controller.spec.coffee | 8 +++----- .../like-project-button.controller.spec.coffee | 4 ++-- .../watch-project-button.controller.spec.coffee | 4 ++-- .../transfer/transfer-project.controller.spec.coffee | 8 ++++---- app/modules/services/current-user.service.spec.coffee | 2 +- 8 files changed, 17 insertions(+), 21 deletions(-) diff --git a/app/modules/components/attachments-full/attachments-full.controller.spec.coffee b/app/modules/components/attachments-full/attachments-full.controller.spec.coffee index 6c623174..2c94948d 100644 --- a/app/modules/components/attachments-full/attachments-full.controller.spec.coffee +++ b/app/modules/components/attachments-full/attachments-full.controller.spec.coffee @@ -158,7 +158,7 @@ describe "AttachmentsController", -> deleteFile = Immutable.Map() mocks.attachmentsFullService.deleteAttachment = sinon.stub() - mocks.attachmentsFullService.deleteAttachment.withArgs(deleteFile, 'us').promise().reject() + mocks.attachmentsFullService.deleteAttachment.withArgs(deleteFile, 'us').promise().reject(new Error('error')) askResponse = { finish: sinon.spy() diff --git a/app/modules/components/attachments-full/attachments-full.service.coffee b/app/modules/components/attachments-full/attachments-full.service.coffee index 8f9a83a3..9e1fd874 100644 --- a/app/modules/components/attachments-full/attachments-full.service.coffee +++ b/app/modules/components/attachments-full/attachments-full.service.coffee @@ -73,7 +73,7 @@ class AttachmentsFullService extends taiga.Service resolve(attachment) else - reject(file) + reject(new Error(file)) loadAttachments: (type, objId, projectId)-> @attachmentsService.list(type, objId, projectId).then (files) => diff --git a/app/modules/external-apps/external-app.controller.spec.coffee b/app/modules/external-apps/external-app.controller.spec.coffee index f6db0c86..e19c5b89 100644 --- a/app/modules/external-apps/external-app.controller.spec.coffee +++ b/app/modules/external-apps/external-app.controller.spec.coffee @@ -104,17 +104,15 @@ describe "ExternalAppController", -> mocks.routeParams.application = 6 mocks.routeParams.state = "testing-state" - xhr = { - status: 404 - } + error = new Error('404') - mocks.tgExternalAppsService.getApplicationToken.withArgs(mocks.routeParams.application, mocks.routeParams.state).promise().reject(xhr) + mocks.tgExternalAppsService.getApplicationToken.withArgs(mocks.routeParams.application, mocks.routeParams.state).promise().reject(error) ctrl = $controller("ExternalApp") setTimeout ( -> expect(mocks.tgLoader.start.withArgs(false)).to.be.calledOnce - expect(mocks.tgXhrErrorService.response.withArgs(xhr)).to.be.calledOnce + expect(mocks.tgXhrErrorService.response.withArgs(error)).to.be.calledOnce done() ) diff --git a/app/modules/profile/profile.controller.spec.coffee b/app/modules/profile/profile.controller.spec.coffee index df37298b..c306682a 100644 --- a/app/modules/profile/profile.controller.spec.coffee +++ b/app/modules/profile/profile.controller.spec.coffee @@ -126,16 +126,14 @@ describe "ProfileController", -> mocks.routeParams.slug = "user-slug" - xhr = { - status: 404 - } + error = new Error('404') - mocks.userService.getUserByUserName.withArgs(mocks.routeParams.slug).promise().reject(xhr) + mocks.userService.getUserByUserName.withArgs(mocks.routeParams.slug).promise().reject(error) ctrl = $controller("Profile") setTimeout ( -> - expect(mocks.xhrErrorService.response.withArgs(xhr)).to.be.calledOnce + expect(mocks.xhrErrorService.response.withArgs(error)).to.be.calledOnce done() ) diff --git a/app/modules/projects/components/like-project-button/like-project-button.controller.spec.coffee b/app/modules/projects/components/like-project-button/like-project-button.controller.spec.coffee index 4669fd9b..8a020485 100644 --- a/app/modules/projects/components/like-project-button/like-project-button.controller.spec.coffee +++ b/app/modules/projects/components/like-project-button/like-project-button.controller.spec.coffee @@ -91,7 +91,7 @@ describe "LikeProjectButton", -> ctrl = $controller("LikeProjectButton") ctrl.project = project - mocks.tgLikeProjectButton.like.withArgs(project.get('id')).promise().reject() + mocks.tgLikeProjectButton.like.withArgs(project.get('id')).promise().reject(new Error('error')) ctrl.toggleLike().finally () -> expect(mocks.tgConfirm.notify.withArgs("error")).to.be.calledOnce @@ -127,7 +127,7 @@ describe "LikeProjectButton", -> ctrl = $controller("LikeProjectButton") ctrl.project = project - mocks.tgLikeProjectButton.unlike.withArgs(project.get('id')).promise().reject() + mocks.tgLikeProjectButton.unlike.withArgs(project.get('id')).promise().reject(new Error('error')) ctrl.toggleLike().finally () -> expect(mocks.tgConfirm.notify.withArgs("error")).to.be.calledOnce diff --git a/app/modules/projects/components/watch-project-button/watch-project-button.controller.spec.coffee b/app/modules/projects/components/watch-project-button/watch-project-button.controller.spec.coffee index c58e4d0e..1d6ce2fe 100644 --- a/app/modules/projects/components/watch-project-button/watch-project-button.controller.spec.coffee +++ b/app/modules/projects/components/watch-project-button/watch-project-button.controller.spec.coffee @@ -118,7 +118,7 @@ describe "WatchProjectButton", -> ctrl.project = project ctrl.showWatchOptions = true - mocks.tgWatchProjectButton.watch.withArgs(project.get('id'), notifyLevel).promise().reject() + mocks.tgWatchProjectButton.watch.withArgs(project.get('id'), notifyLevel).promise().reject(new Error('error')) ctrl.watch(notifyLevel).finally () -> expect(mocks.tgConfirm.notify.withArgs("error")).to.be.calledOnce @@ -159,7 +159,7 @@ describe "WatchProjectButton", -> ctrl.project = project ctrl.showWatchOptions = true - mocks.tgWatchProjectButton.unwatch.withArgs(project.get('id')).promise().reject() + mocks.tgWatchProjectButton.unwatch.withArgs(project.get('id')).promise().reject(new Error('error')) ctrl.unwatch().finally () -> expect(mocks.tgConfirm.notify.withArgs("error")).to.be.calledOnce diff --git a/app/modules/projects/transfer/transfer-project.controller.spec.coffee b/app/modules/projects/transfer/transfer-project.controller.spec.coffee index 6d6af88c..812b67b8 100644 --- a/app/modules/projects/transfer/transfer-project.controller.spec.coffee +++ b/app/modules/projects/transfer/transfer-project.controller.spec.coffee @@ -113,7 +113,7 @@ describe "TransferProject", -> mocks.auth.refresh.promise().resolve() mocks.routeParams.token = "BAD_TOKEN" mocks.currentUserService.getUser.returns(user) - mocks.projectsService.transferValidateToken.withArgs(1, "BAD_TOKEN").promise().reject() + mocks.projectsService.transferValidateToken.withArgs(1, "BAD_TOKEN").promise().reject(new Error('error')) mocks.tgNavUrls.resolve.withArgs("not-found").returns("/not-found") ctrl = $controller("TransferProjectController") @@ -247,7 +247,7 @@ describe "TransferProject", -> expect(mocks.location.path).to.be.calledWith("/project/slug/") expect(mocks.tgConfirm.notify).to.be.calledWith("success", "ACCEPTED_PROJECT_OWNERNSHIP", '', 5000) - done() + done() it "transfer reject", (done) -> project = Immutable.fromJS({ @@ -262,7 +262,7 @@ describe "TransferProject", -> mocks.currentUserService.getUser.returns(user) mocks.projectsService.transferValidateToken.withArgs(1, "TOKEN").promise().resolve() mocks.projectsService.transferReject.withArgs(1, "TOKEN", "this is my reason").promise().resolve() - mocks.tgNavUrls.resolve.withArgs("project-admin-project-profile-details", {project: "slug"}).returns("/project/slug/") + mocks.tgNavUrls.resolve.withArgs("home", {project: "slug"}).returns("/project/slug/") mocks.translate.instant.withArgs("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP").returns("REJECTED_PROJECT_OWNERNSHIP") ctrl = $controller("TransferProjectController") @@ -272,4 +272,4 @@ describe "TransferProject", -> expect(mocks.location.path).to.be.calledWith("/project/slug/") expect(mocks.tgConfirm.notify).to.be.calledWith("success", "REJECTED_PROJECT_OWNERNSHIP", '', 5000) - done() + done() diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee index fba99a7f..90c08398 100644 --- a/app/modules/services/current-user.service.spec.coffee +++ b/app/modules/services/current-user.service.spec.coffee @@ -190,7 +190,7 @@ describe "tgCurrentUserService", -> done() it "create default joyride config", (done) -> - mocks.resources.user.getUserStorage.withArgs('joyride').promise().reject() + mocks.resources.user.getUserStorage.withArgs('joyride').promise().reject(new Error('error')) currentUserService.loadJoyRideConfig().then (config) -> joyride = {