diff --git a/app/modules/profile/profile.controller.spec.coffee b/app/modules/profile/profile.controller.spec.coffee index d471f100..72cf392c 100644 --- a/app/modules/profile/profile.controller.spec.coffee +++ b/app/modules/profile/profile.controller.spec.coffee @@ -11,9 +11,7 @@ describe "ProfileController", -> ]) _mockTranslate = () -> - mocks.translate = { - instant: sinon.stub() - } + mocks.translate = sinon.stub() provide.value "$translate", mocks.translate @@ -83,12 +81,12 @@ describe "ProfileController", -> bio: "bio" }) - mocks.translate.instant + mocks.translate .withArgs('USER.PROFILE.PAGE_TITLE', { userFullName: user.get("full_name_display"), userUsername: user.get("username") }) - .returns('user-profile-page-title') + .promise().resolve('user-profile-page-title') mocks.userService.getUserByUserName.withArgs(mocks.routeParams.slug).promise().resolve(user) @@ -119,7 +117,7 @@ describe "ProfileController", -> done() ) - it "define current user", () -> + it "define current user", (done) -> $scope = $rootScope.$new() user = Immutable.fromJS({ @@ -128,17 +126,20 @@ describe "ProfileController", -> bio: "bio" }) - mocks.translate.instant + mocks.translate .withArgs('USER.PROFILE.PAGE_TITLE', { userFullName: user.get("full_name_display"), userUsername: user.get("username") }) - .returns('user-profile-page-title') + .promise().resolve('user-profile-page-title') mocks.currentUser.getUser.returns(user) ctrl = $controller("Profile") - expect(ctrl.user).to.be.equal(user) - expect(ctrl.isCurrentUser).to.be.true - expect(mocks.appMetaService.setAll.withArgs("user-profile-page-title", "bio")).to.be.calledOnce + setTimeout ( -> + expect(ctrl.user).to.be.equal(user) + expect(ctrl.isCurrentUser).to.be.true + expect(mocks.appMetaService.setAll.withArgs("user-profile-page-title", "bio")).to.be.calledOnce + done() + ) diff --git a/app/modules/projects/project/project.controller.spec.coffee b/app/modules/projects/project/project.controller.spec.coffee index 03951199..d3d0cca7 100644 --- a/app/modules/projects/project/project.controller.spec.coffee +++ b/app/modules/projects/project/project.controller.spec.coffee @@ -39,9 +39,7 @@ describe "ProjectController", -> provide.value "tgXhrErrorService", mocks.xhrErrorService _mockTranslate = () -> - mocks.translate = { - instant: sinon.stub() - } + mocks.translate = sinon.stub() provide.value "$translate", mocks.translate @@ -86,11 +84,11 @@ describe "ProjectController", -> description: "projectDescription" }) - mocks.translate.instant + mocks.translate .withArgs('PROJECT.PAGE_TITLE', { projectName: project.get("name") }) - .returns('projectTitle') + .promise().resolve('projectTitle') mocks.projectService.getProjectBySlug.withArgs("project-slug").promise().resolve(project) diff --git a/app/modules/services/app-meta.service.spec.coffee b/app/modules/services/app-meta.service.spec.coffee index d2a4ad0d..ede2294d 100644 --- a/app/modules/services/app-meta.service.spec.coffee +++ b/app/modules/services/app-meta.service.spec.coffee @@ -27,7 +27,7 @@ describe "AppMetaService", -> expect($("meta[name='twitter:site']")).to.have.attr("content", "@taigaio") expect($("meta[name='twitter:title']")).to.have.attr("content", data.title) expect($("meta[name='twitter:description']")).to.have.attr("content", data.description) - expect($("meta[name='twitter:image']")).to.have.attr("content", "#{window.location.origin}/images/favicon.png") + expect($("meta[name='twitter:image']")).to.have.attr("content", "#{window.location.origin}/images/logo-color.png") it "set meta for open graph", () -> appMetaService.setOpenGraphMetas(data.title, data.description) @@ -35,7 +35,7 @@ describe "AppMetaService", -> expect($("meta[property='og:site_name']")).to.have.attr("content", "Taiga - Love your projects") expect($("meta[property='og:title']")).to.have.attr("content", data.title) expect($("meta[property='og:description']")).to.have.attr("content", data.description) - expect($("meta[property='og:image']")).to.have.attr("content", "#{window.location.origin}/images/favicon.png") + expect($("meta[property='og:image']")).to.have.attr("content", "#{window.location.origin}/images/logo-color.png") expect($("meta[property='og:url']")).to.have.attr("content", window.location.href) it "set all meta", () -> @@ -46,10 +46,10 @@ describe "AppMetaService", -> expect($("meta[name='twitter:site']")).to.have.attr("content", "@taigaio") expect($("meta[name='twitter:title']")).to.have.attr("content", data.title) expect($("meta[name='twitter:description']")).to.have.attr("content", data.description) - expect($("meta[name='twitter:image']")).to.have.attr("content", "#{window.location.origin}/images/favicon.png") + expect($("meta[name='twitter:image']")).to.have.attr("content", "#{window.location.origin}/images/logo-color.png") expect($("meta[property='og:type']")).to.have.attr("content", "object") expect($("meta[property='og:site_name']")).to.have.attr("content", "Taiga - Love your projects") expect($("meta[property='og:title']")).to.have.attr("content", data.title) expect($("meta[property='og:description']")).to.have.attr("content", data.description) - expect($("meta[property='og:image']")).to.have.attr("content", "#{window.location.origin}/images/favicon.png") + expect($("meta[property='og:image']")).to.have.attr("content", "#{window.location.origin}/images/logo-color.png") expect($("meta[property='og:url']")).to.have.attr("content", window.location.href)