osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ES6: Half a dozen more controllers

Browse Source
This commit is contained in:
Robin Ward
2014-05-15 11:19:45 -04:00
parent 986e8f2f0f
commit 026cfe2dc7
9 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/javascripts/controllers/search_controller_test.js
+2 -2
View File
@@ -1,6 +1,6 @@
var controller, searcherStub;
module("Discourse.SearchController", {
module("controller:search", {
setup: function() {
Discourse.SiteSettings.min_search_term_length = 2;
@@ -10,7 +10,7 @@ module("Discourse.SearchController", {
searcherStub = Ember.Deferred.create();
sinon.stub(Discourse.Search, "forTerm").returns(searcherStub);
controller = Discourse.SearchController.create();
controller = testController('search', []);
},
teardown: function() {
test/javascripts/controllers/site_map_category_controller_test.js
+2 -2
View File
@@ -1,8 +1,8 @@
var controller;
module("Discourse.SiteMapCategoryController", {
module("controller:site-map-category", {
setup: function() {
controller = Discourse.SiteMapCategoryController.create();
controller = testController('site-map-category');
}
});
test/javascripts/controllers/site_map_controller_test.js
+3 -3
View File
@@ -1,10 +1,10 @@
var controller, oldMobileView;
module("Discourse.SiteMapController", {
module("controller:site-map", {
setup: function() {
oldMobileView = Discourse.Mobile.mobileView;
controller = Discourse.SiteMapController.create();
controller = testController('site-map');
},
teardown: function() {
@@ -13,7 +13,7 @@ module("Discourse.SiteMapController", {
});
test("itemController", function() {
equal(controller.get("itemController"), "siteMapCategory", "defaults to SiteMapCategoryController");
equal(controller.get("itemController"), "site-map-category", "defaults to site-map-category");
});
test("showAdminLinks", function() {