IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-02 05:29:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed jasmine specs that relied on old Discourse user api.

Browse Source
This commit is contained in:
Robin Ward 2013-05-28 12:09:03 -04:00
parent dd54736d06
commit feb966a1cf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spec/javascripts/components/click_track_spec.js
View File

@ -79,14 +79,16 @@ describe("Discourse.ClickTrack", function() {
describe("badges", function() { describe("badges", function() {
it("does not update badge clicks on my own link", function() { it("does not update badge clicks on my own link", function() {
spyOn(Discourse.User, 'current').andReturn(314);
spyOn(Discourse, "get").andReturn(314); spyOn(Discourse, "get").andReturn(314);
track(generateClickEventOn('#with-badge')); track(generateClickEventOn('#with-badge'));
var $badge = $('span.badge', $('#with-badge').first()); var $badge = $('span.badge', $('#with-badge').first());
expect(parseInt($badge.html(), 10)).toEqual(1); expect(parseInt($badge.html(), 10)).toEqual(1);
}); });
it("does not update badge clicks on links in my own post", function() { 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')); track(generateClickEventOn('#with-badge-but-not-mine'));
var $badge = $('span.badge', $('#with-badge-but-not-mine').first()); var $badge = $('span.badge', $('#with-badge-but-not-mine').first());
expect(parseInt($badge.html(), 10)).toEqual(1); expect(parseInt($badge.html(), 10)).toEqual(1);
@ -200,12 +202,11 @@ describe("Discourse.ClickTrack", function() {
it("in another window", function() { it("in another window", function() {
// spies // spies
spyOn(Discourse, 'get').andReturn(true); spyOn(Discourse.User, 'current').andReturn(true);
spyOn(window, 'open').andCallFake(function() { return { focus: function() {} } }); spyOn(window, 'open').andCallFake(function() { return { focus: function() {} } });
spyOn(window, 'focus'); spyOn(window, 'focus');
// test // test
expect(track(clickEvent)).toBe(false); 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'); expect(window.open).toHaveBeenCalledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42', '_blank');
}); });