Cleaned up QUnit test structure

eviltrout · eviltrout · commit 4cd71972bef1 · 2013-06-20T13:58:54.000-04:00
diff --git a/.jshintrc b/.jshintrc
@@ -31,7 +31,22 @@
     "PreloadStore",
     "Handlebars",
     "I18n",
-    "bootbox"],
+    "bootbox",
+    "module",
+    "integration",
+    "test",
+    "ok",
+    "expect",
+    "equal",
+    "blank",
+    "present",
+    "visit",
+    "count",
+    "exists",
+    "asyncTest",
+    "find",
+    "resolvingPromise",
+    "sinon"],
   "browser":true,
   "rhino":false,
   "devel":true,
diff --git a/config/jshint.yml b/config/jshint.yml
@@ -77,6 +77,21 @@ predef:
   - bootbox
   - moment
   - _
+  - module
+  - integration
+  - test
+  - ok
+  - expect
+  - equal
+  - blank
+  - present
+  - visit
+  - count
+  - exists
+  - asyncTest
+  - find
+  - resolvingPromise
+  - sinon
 
 browser:  true      # true if the standard browser globals should be predefined
 rhino:    false     # true if the Rhino environment globals should be predefined
diff --git a/lib/discourse_iife.rb b/lib/discourse_iife.rb
@@ -8,8 +8,9 @@ def evaluate(context, locals)
     # Only discourse or admin paths
     return data unless (path =~ /\/javascripts\/discourse/ || path =~ /\/javascripts\/admin/ || path =~ /\/test\/javascripts/)
 
-    # Ignore the js helper
+    # Ignore the js helpers
     return data if (path =~ /test\_helper\.js/)
+    return data if (path =~ /javascripts\/helpers\//)
 
     # Ignore translations
     return data if (path =~ /\/translations/)
diff --git a/test/javascripts/components/bbcode_test.js b/test/javascripts/components/bbcode_test.js
@@ -1,4 +1,4 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true equal:true present:true md5:true */
+/*global md5:true */
 
 module("Discourse.BBCode");
 
diff --git a/test/javascripts/components/click_track_test.js b/test/javascripts/components/click_track_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true sinon:true blank:true */
-
 module("Discourse.ClickTrack", {
   setup: function() {
 
diff --git a/test/javascripts/components/formatter_test.js b/test/javascripts/components/formatter_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true md5:true */
-
 module("Discourse.Formatter");
 
 var format = "tiny";
diff --git a/test/javascripts/components/key_value_store_test.js b/test/javascripts/components/key_value_store_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true md5:true */
-
 var store = Discourse.KeyValueStore;
 
 module("Discourse.KeyValueStore", {
diff --git a/test/javascripts/components/markdown_test.js b/test/javascripts/components/markdown_test.js
@@ -1,4 +1,4 @@
-/*global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true md5:true sanitizeHtml:true */
+/*global sanitizeHtml:true */
 
 module("Discourse.Markdown");
 
diff --git a/test/javascripts/components/onebox_test.js b/test/javascripts/components/onebox_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true md5:true resolvingPromise:true */
-
 module("Discourse.Onebox", {
   setup: function() {
     this.anchor = $("<a href='http://bla.com'></a>")[0];
diff --git a/test/javascripts/components/preload_store_test.js b/test/javascripts/components/preload_store_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true equal:true count:true present:true asyncTest:true blank:true */
-
 module("Discourse.PreloadStore", {
   setup: function() {
     PreloadStore.store('bane', 'evil');
diff --git a/test/javascripts/components/utilities_test.js b/test/javascripts/components/utilities_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true equal:true */
-
 module("Discourse.Utilities");
 
 var utils = Discourse.Utilities;
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
@@ -0,0 +1,32 @@
+// Test helpers
+var resolvingPromise = Ember.Deferred.promise(function (p) {
+  p.resolve();
+})
+
+function exists(selector) {
+  return !!count(selector);
+}
+
+function count(selector) {
+  return find(selector).length;
+}
+
+function objBlank(obj) {
+  if (obj === undefined) return true;
+
+  switch (typeof obj) {
+  case "string":
+    return obj.trim().length === 0;
+  case "object":
+    return $.isEmptyObject(obj);
+  }
+  return false;
+}
+
+function present(obj, text) {
+  equal(objBlank(obj), false, text);
+}
+
+function blank(obj, text) {
+  equal(objBlank(obj), true, text);
+}
diff --git a/test/javascripts/helpers/qunit_helpers.js b/test/javascripts/helpers/qunit_helpers.js
@@ -0,0 +1,11 @@
+function integration(name) {
+  module(name, {
+    setup: function() {
+      Ember.run(Discourse, Discourse.advanceReadiness);
+    },
+
+    teardown: function() {
+      Discourse.reset();
+    }
+  });
+}
diff --git a/test/javascripts/integration/header_test.js b/test/javascripts/integration/header_test.js
@@ -1,14 +1,4 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true */
-
-module("Header", {
-  setup: function() {
-    Ember.run(Discourse, Discourse.advanceReadiness);
-  },
-
-  teardown: function() {
-    Discourse.reset();
-  }
-});
+integration("Header");
 
 test("/", function() {
 
diff --git a/test/javascripts/integration/list_topics_test.js b/test/javascripts/integration/list_topics_test.js
@@ -1,14 +1,4 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true */
-
-module("List Topics", {
-  setup: function() {
-    Ember.run(Discourse, Discourse.advanceReadiness);
-  },
-
-  teardown: function() {
-    Discourse.reset();
-  }
-});
+integration("List Topics");
 
 test("/", function() {
 
diff --git a/test/javascripts/mixins/presence_test.js b/test/javascripts/mixins/presence_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true */
-
 module("Discourse.Presence");
 
 var testObj = Em.Object.createWithMixins(Discourse.Presence, {
diff --git a/test/javascripts/mixins/selected_posts_count_test.js b/test/javascripts/mixins/selected_posts_count_test.js
@@ -1,4 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true equal:true */
 module("Discourse.SelectedPostsCount");
 
 var buildTestObj = function(params, topicParams) {
diff --git a/test/javascripts/models/category_test.js b/test/javascripts/models/category_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true equal:true */
-
 module("Discourse.Category");
 
 test('slugFor', function(){
diff --git a/test/javascripts/models/composer_test.js b/test/javascripts/models/composer_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true equal:true */
-
 module("Discourse.Composer");
 
 
diff --git a/test/javascripts/models/nav_item_test.js b/test/javascripts/models/nav_item_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true equal:true */
-
 module("Discourse.NavItem", {
   setup: function() {
     this.site = Discourse.Site.instance();
diff --git a/test/javascripts/models/report_test.js b/test/javascripts/models/report_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true equal:true blank:true */
-
 module("Discourse.Report");
 
 function reportWithData(data) {
diff --git a/test/javascripts/models/site_test.js b/test/javascripts/models/site_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true present:true equal:true */
-
 module("Discourse.Site");
 
 test('instance', function(){
diff --git a/test/javascripts/models/user_action_test.js b/test/javascripts/models/user_action_test.js
@@ -1,5 +1,3 @@
-/*global module:true test:true ok:true visit:true expect:true exists:true count:true present:true equal:true */
-
 module("Discourse.UserAction");
 
 test("collapsing likes", function () {
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
@@ -36,11 +36,12 @@
 //= require sinon-1.7.1.js
 //= require sinon-qunit-1.0.0.js
 
+//= require helpers/qunit_helpers
+//= require helpers/assertions
+//= require_tree ./fixtures
 //= require_tree .
 //= require_self
 
-//= require_tree ./fixtures
-
 // sinon settings
 sinon.config = {
     injectIntoThis: true,
@@ -65,35 +66,3 @@ Discourse.Router.map(function() {
   return Discourse.routeBuilder.call(this);
 });
 
-// Test helpers
-var resolvingPromise = Ember.Deferred.promise(function (p) {
-  p.resolve();
-})
-
-function exists(selector) {
-  return !!count(selector);
-}
-
-function count(selector) {
-  return find(selector).length;
-}
-
-function objBlank(obj) {
-  if (obj === undefined) return true;
-
-  switch (typeof obj) {
-  case "string":
-    return obj.trim().length === 0;
-  case "object":
-    return $.isEmptyObject(obj);
-  }
-  return false;
-}
-
-function present(obj, text) {
-  equal(objBlank(obj), false, text);
-}
-
-function blank(obj, text) {
-  equal(objBlank(obj), true, text);
-}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/global module:true test:true ok:true visit:true expect:true exists:true count:true equal:true present:true md5:true /`
	`1`	`+/global md5:true /`
`2`	`2`
`3`	`3`	`module("Discourse.BBCode");`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true sinon:true blank:true /`
`2`		`-`
`3`	`1`	`module("Discourse.ClickTrack", {`
`4`	`2`	`setup: function() {`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true md5:true /`
`2`		`-`
`3`	`1`	`module("Discourse.Formatter");`
`4`	`2`
`5`	`3`	`var format = "tiny";`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true md5:true /`
`2`		`-`
`3`	`1`	`var store = Discourse.KeyValueStore;`
`4`	`2`
`5`	`3`	`module("Discourse.KeyValueStore", {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true md5:true sanitizeHtml:true /`
	`1`	`+/global sanitizeHtml:true /`
`2`	`2`
`3`	`3`	`module("Discourse.Markdown");`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/global module:true test:true ok:true visit:true equal:true exists:true count:true equal:true present:true md5:true resolvingPromise:true /`
`2`		`-`
`3`	`1`	`module("Discourse.Onebox", {`
`4`	`2`	`setup: function() {`
`5`	`3`	`this.anchor = $("<a href='http://bla.com'></a>")[0];`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/global module:true test:true ok:true visit:true expect:true exists:true equal:true count:true present:true asyncTest:true blank:true /`
`2`		`-`
`3`	`1`	`module("Discourse.PreloadStore", {`
`4`	`2`	`setup: function() {`
`5`	`3`	`PreloadStore.store('bane', 'evil');`