From feb966a1cff404761f78d595f01edb80c124c4aa Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 28 May 2013 12:09:03 -0400 Subject: [PATCH] Fixed jasmine specs that relied on old Discourse user api. --- spec/javascripts/components/click_track_spec.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/javascripts/components/click_track_spec.js b/spec/javascripts/components/click_track_spec.js index 86dfdf5ebe2..359ef4b8993 100644 --- a/spec/javascripts/components/click_track_spec.js +++ b/spec/javascripts/components/click_track_spec.js @@ -79,14 +79,16 @@ describe("Discourse.ClickTrack", function() { describe("badges", function() { it("does not update badge clicks on my own link", function() { + spyOn(Discourse.User, 'current').andReturn(314); spyOn(Discourse, "get").andReturn(314); + track(generateClickEventOn('#with-badge')); var $badge = $('span.badge', $('#with-badge').first()); expect(parseInt($badge.html(), 10)).toEqual(1); }); it("does not update badge clicks on links in my own post", function() { - spyOn(Discourse, "get").andReturn(3141); + spyOn(Discourse.User, 'current').andReturn(3141); track(generateClickEventOn('#with-badge-but-not-mine')); var $badge = $('span.badge', $('#with-badge-but-not-mine').first()); expect(parseInt($badge.html(), 10)).toEqual(1); @@ -200,12 +202,11 @@ describe("Discourse.ClickTrack", function() { it("in another window", function() { // spies - spyOn(Discourse, 'get').andReturn(true); + spyOn(Discourse.User, 'current').andReturn(true); spyOn(window, 'open').andCallFake(function() { return { focus: function() {} } }); spyOn(window, 'focus'); // test expect(track(clickEvent)).toBe(false); - expect(Discourse.get).toHaveBeenCalledWith('currentUser.external_links_in_new_tab'); expect(window.open).toHaveBeenCalledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42', '_blank'); });