Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactors Discourse.SearchController

This commit is contained in:
Wojciech Zawistowski 2014-01-29 20:53:08 +01:00
parent 946e837542
commit 5b897bc6a4
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/controllers/search_controller.js
View File

@ -18,6 +18,7 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, {
} else {
this.set('content', Em.A());
this.set('resultCount', 0);
this.set('urls', []);
}
this.set('selectedIndex', 0);
}.observes('term', 'typeFilter'),
@ -25,6 +26,7 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, {
searchTerm: Discourse.debouncePromise(function(term, typeFilter) {
var self = this;
self.set('resultCount', 0);
self.set('urls', []);
var searcher = Discourse.Search.forTerm(term, {
typeFilter: typeFilter,
@ -32,7 +34,7 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, {
});
return searcher.then(function(results) {
self.set('results', results);
var urls = [];
if (results) {
self.set('noResults', results.length === 0);
@ -45,12 +47,14 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, {
.each(function(list){
_.each(list.results, function(item){
item.index = index++;
urls.pushObject(item.url);
});
})
.value();
self.set('resultCount', index);
self.set('content', results);
self.set('urls', urls);
}
self.set('loading', false);
@ -92,10 +96,9 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, {
select: function() {
if (this.get('loading')) return;
var href = $('#search-dropdown li.selected a').prop('href');
var href = this.get('urls')[this.get("selectedIndex")];
if (href) {
Discourse.URL.routeTo(href);
}
}
});

39
test/javascripts/controllers/search_controller_test.js
View File

@ -196,37 +196,40 @@ test("keyboard navigation", function() {
equal(controller.get("selectedIndex"), 0, "you can go up from the middle item");
});
// This test is a bit hackish due to the current design
// of the SearchController that manipulates the DOM directly.
// The alternative was to skip this test completely
// and verify selecting highlighted item in an end-to-end
// test, but I think that testing all the edge cases
// (existing/missing href, loading flag true/false) is too
// fine grained for an e2e test, so untill SearchController
// is refactored I decided to keep the test here.
test("selecting a highlighted item", function() {
this.stub(Discourse.URL, "routeTo");
fixture().append($('<div id="search-dropdown"><ul><ul><li class="selected"><a>some text</a></li></ul></ul></div>'));
Ember.run(function() {
controller.set("term", "ab");
searcherStub.resolve([
{
type: "user",
results: [
{},
{url: "some-url"}
]
}
]);
});
Ember.run(function() {
controller.set("loading", false);
controller.set("selectedIndex", 0);
});
controller.select();
ok(!Discourse.URL.routeTo.called, "when selected item's link has no href, there is no redirect");
ok(!Discourse.URL.routeTo.called, "when selected item has no url, there is no redirect");
Ember.run(function() {
controller.set("selectedIndex", 1);
});
controller.select();
ok(Discourse.URL.routeTo.calledWith("some-url"), "when selected item has url, a redirect is fired");
Discourse.URL.routeTo.reset();
Ember.run(function() {
controller.set("loading", true);
});
fixture("a").attr("href", "some-url");
controller.select();
ok(!Discourse.URL.routeTo.called, "when loading flag is set to true, there is no redirect");
Ember.run(function() {
controller.set("loading", false);
});
controller.select();
ok(Discourse.URL.routeTo.calledWith(sinon.match(/\/some-url$/)), "when loading flag is set to false and selected item's link has href, redirect to the selected item's link href is fired");
});
test("search query / the flow of the search", function() {