From 74cbb18f67a71045b7e0219994cbe3d1a22351e7 Mon Sep 17 00:00:00 2001
From: Wojciech Zawistowski <wojciech.zawistowski@gmail.com>
Date: Thu, 7 Nov 2013 18:18:07 +0100
Subject: [PATCH] removes redundant #qunit-scratch (replaces it with standard
 #qunit-fixture)

---
 test/javascripts/lib/click_track_test.js | 15 ++++++---------
 test/javascripts/test_helper.js          |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/javascripts/lib/click_track_test.js b/test/javascripts/lib/click_track_test.js
index d3c3ba28b8e..1a01a9bd46d 100644
--- a/test/javascripts/lib/click_track_test.js
+++ b/test/javascripts/lib/click_track_test.js
@@ -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");
 });
 
 
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 797080c81db..cfddf70564b 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -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>');