github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 02:54:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ES6: AvatarSelector and HeaderController - also includes support for controllers with

Browse Source 
camelcase via an error message.
This commit is contained in:
Robin Ward
2014-04-29 21:16:57 -04:00
parent 0327f469c1
commit 44b2f82be8
7 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/javascripts/controllers/avatar_selector_controller_test.js
View File

@ -4,10 +4,10 @@ var avatarSelector = Em.Object.create({
uploaded_avatar_template: "//cdn.discourse.org/uploads/meta_discourse/avatars/093/607/185cff113e/{size}.jpg"
});
module("Discourse.AvatarSelectorController");
module("controller:avatar-selector");
test("avatarTemplate", function() {
var avatarSelectorController = testController(Discourse.AvatarSelectorController);
var avatarSelectorController = controllerFor('avatar-selector');
avatarSelectorController.setProperties(avatarSelector);
equal(avatarSelectorController.get("avatarTemplate"),

4
test/javascripts/controllers/header_controller_test.js
View File

@ -1,4 +1,4 @@
module("Discourse.HeaderController");
module("controller:header", "Header Controller");
test("showNotifications action", function() {
var resolveRequestWith;
@ -7,7 +7,7 @@ test("showNotifications action", function() {
});
var controller = Discourse.HeaderController.create();
var controller = controllerFor('header');
var viewSpy = {
showDropdownBySelector: sinon.spy()
};

11
test/javascripts/ember/resolver_test.js
View File

@ -14,6 +14,11 @@ function setTemplates(lookupStrings) {
});
}
function normalized(input, expected, desc) {
var resolver = Discourse.Resolver.create({namespace: Discourse});
equal(resolver.normalizeName(input), expected, desc);
}
module("Discourse.Resolver", {
setup: function() {
originalTemplates = Ember.TEMPLATES;
@ -29,6 +34,12 @@ module("Discourse.Resolver", {
}
});
test("normalizeName", function() {
normalized('header', 'header', 'a single word stays the same');
normalized('avatarSelector', 'avatar-selector', 'camel case is converted to dashed');
normalized('avatar_selector', 'avatar-selector', 'underscores are converted to dashes');
});
test("finds templates in top level dir", function() {
setTemplates([
"foobar",