codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1623 from velesin/remove_qunit_scratch

Browse source 
removes redundant #qunit-scratch (use standard #qunit-fixture instead)
This commit is contained in:
Robin Ward 2013-11-07 12:33:58 -08:00
commit 43c577adf5
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/javascripts/lib/click_track_test.js
View file

@ -8,7 +8,7 @@ module("Discourse.ClickTrack", {
this.windowOpen = sinon.stub(window, "open").returns(this.win);
sinon.stub(this.win, "focus");
$('#qunit-scratch').html([
$('#qunit-fixture').html([
'<div id="topic" id="1337">',
' <article data-post-id="42" data-user-id="3141">',
' <a href="http://www.google.com">google.com</a>',
@ -26,9 +26,6 @@ module("Discourse.ClickTrack", {
},
teardown: function() {
$('#topic').remove();
$('#qunit-scratch').html('');
Discourse.URL.redirectTo.restore();
Discourse.ajax.restore();
window.open.restore();
@ -40,7 +37,7 @@ var track = Discourse.ClickTrack.trackClick;
// test
var generateClickEventOn = function(selector) {
return $.Event("click", { currentTarget: $(selector)[0] });
return $.Event("click", { currentTarget: $("#qunit-fixture " + selector)[0] });
};
test("does not track clicks on lightboxes", function() {
@ -69,7 +66,7 @@ test("does not track clicks on quote buttons", function() {
test("removes the href and put it as a data attribute", function() {
track(generateClickEventOn('a'));
var $link = $('a').first();
var $link = $('#qunit-fixture a').first();
ok($link.hasClass('no-href'));
equal($link.data('href'), 'http://www.google.com');
blank($link.attr('href'));
@ -80,7 +77,7 @@ test("removes the href and put it as a data attribute", function() {
var badgeClickCount = function(id, expected) {
track(generateClickEventOn('#' + id));
var $badge = $('span.badge', $('#' + id).first());
var $badge = $('span.badge', $('#qunit-fixture #' + id).first());
equal(parseInt($badge.html(), 10), expected);
};
@ -108,13 +105,13 @@ var trackRightClick = function() {
test("right clicks change the href", function() {
ok(trackRightClick());
equal($('a').first().prop('href'), "http://www.google.com/");
equal($('#qunit-fixture a').first().prop('href'), "http://www.google.com/");
});
test("right clicks are tracked", function() {
Discourse.SiteSettings.track_external_right_clicks = true;
trackRightClick();
equal($('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42");
equal($('#qunit-fixture a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42");
});

1
test/javascripts/test_helper.js
View file

@ -94,7 +94,6 @@ $.ajax = function() {
// Trick JSHint into allow document.write
var d = document;
d.write('<div id="qunit-scratch" style="display:none"></div>');
d.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
d.write('<style>#ember-testing-container { position: absolute; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; } #ember-testing { zoom: 50%; }</style>');