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

Prune dead code for search keyboard navigation in search, remove bad 

tests.
This commit is contained in:
Robin Ward 2014-09-03 15:05:22 -04:00
parent 40b1558f83
commit dac4ed5a1e
2 changed files with 6 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/discourse/controllers/search.js.es6
View File

@ -35,14 +35,13 @@ export default Em.Controller.extend(Discourse.Presence, {
this.set('loading', true);
this.searchTerm(term, this.get('typeFilter'));
} else {
this.setProperties({ content: null, resultCount: 0, urls: [] });
this.setProperties({ content: null });
}
this.set('selectedIndex', 0);
}.observes('term', 'typeFilter'),
searchTerm: Discourse.debouncePromise(function(term, typeFilter) {
var self = this;
this.setProperties({ resultCount: 0, urls: [] });
var context;
if(this.get('searchContextEnabled')){
@ -53,9 +52,11 @@ export default Em.Controller.extend(Discourse.Presence, {
typeFilter: typeFilter,
searchContext: context
}).then(function(results) {
var urls = [];
if (results) {
// Topics might not be included
if (!results.topics) { results.topics = []; }
var topicMap = {};
results.topics = results.topics.map(function(topic){
topic = Discourse.Topic.create(topic);
@ -66,19 +67,16 @@ export default Em.Controller.extend(Discourse.Presence, {
results.posts = results.posts.map(function(post){
post = Discourse.Post.create(post);
post.set('topic', topicMap[post.topic_id]);
urls.push(post.get('url'));
return post;
});
results.users = results.users.map(function(user){
user = Discourse.User.create(user);
urls.push(user.get('path'));
return user;
});
results.categories = results.categories.map(function(category){
category = Discourse.Category.create(category);
urls.push(category.get('url'));
return category;
});
@ -100,11 +98,8 @@ export default Em.Controller.extend(Discourse.Presence, {
results.displayType = self.get('searchContext') === 'topic' ? 'post' : results.type;
var noResults = urls.length === 0;
self.setProperties({ noResults: noResults,
resultCount: urls.length,
content: noResults ? null : Em.Object.create(results),
urls: urls });
var noResults = !!((results.topics.length === 0) && (results.posts.length === 0) && (results.categories.length === 0));
self.setProperties({ noResults: noResults, content: noResults ? null : Em.Object.create(results) });
}
self.set('loading', false);
}).catch(function() {

194
test/javascripts/controllers/search-test.js.es6
View File

@ -1,194 +0,0 @@
var searcherStub;
moduleFor("controller:search", "controller:search", {
setup: function() {
Discourse.SiteSettings.min_search_term_length = 2;
searcherStub = Ember.Deferred.create();
sandbox.stub(Discourse.Search, "forTerm").returns(searcherStub);
}
});
test("when no search term is typed yet", function() {
var controller = this.subject();
ok(!controller.get("loading"), "loading flag is false");
ok(!controller.get("noResults"), "noResults flag is false");
ok(!controller.get("content"), "content is empty");
blank(controller.get("selectedIndex"), "selectedIndex is not set");
blank(controller.get("resultCount"), "result count is not set");
});
test("when user started typing a search term but did not reach the minimum character count threshold yet", function() {
var controller = this.subject();
controller.set("term", "a");
ok(!controller.get("loading"), "loading flag is false");
ok(!controller.get("noResults"), "noResults flag is false");
ok(!controller.get("content"), "content is empty");
equal(controller.get("selectedIndex"), 0, "selectedIndex is set to 0");
equal(controller.get("resultCount"), 0, "result count is set to 0");
});
test("when user typed a search term that is equal to or exceeds the minimum character count threshold, but results have not yet finished loading", function() {
var controller = this.subject();
controller.set("term", "ab");
ok(controller.get("loading"), "loading flag is true");
ok(!controller.get("noResults"), "noResults flag is false");
ok(!controller.get("content"), "content is empty");
equal(controller.get("selectedIndex"), 0, "selectedIndex is set to 0");
equal(controller.get("resultCount"), 0, "result count is set to 0");
});
test("when user typed a search term that is equal to or exceeds the minimum character count threshold and results have finished loading, but there are no results found", function() {
var controller = this.subject();
Em.run(function() {
searcherStub.resolve(
{
type: "topic",
posts: [],
categories: [],
topics: [],
users: [],
grouped_search_result: {},
}
);
controller.set("term", "ab");
});
ok(!controller.get("loading"), "loading flag is false");
ok(controller.get("noResults"), "noResults flag is true");
ok(!controller.get("content"), "content is empty");
equal(controller.get("selectedIndex"), 0, "selectedIndex is set to 0");
equal(controller.get("resultCount"), 0, "result count is set to 0");
});
test("when user typed a search term that is equal to or exceeds the minimum character count threshold and results have finished loading, and there are results found", function() {
var controller = this.subject();
Em.run(function() {
controller.set("term", "ab");
searcherStub.resolve(
{
type: "topic",
posts: [{}],
categories: [],
topics: [],
users: [],
grouped_search_result: {},
}
);
});
ok(!controller.get("loading"), "loading flag is false");
ok(!controller.get("noResults"), "noResults flag is false");
equal(controller.get("selectedIndex"), 0, "selectedIndex is set to 0");
equal(controller.get("resultCount"), 1, "resultCount is correctly set");
});
test("starting to type a new term resets the previous search results", function() {
var controller = this.subject();
Em.run.next(function() {
controller.set("term", "ab");
searcherStub.resolve(
{
type: "topic",
posts: [],
categories: [],
topics: [],
users: [{}],
grouped_search_result: {},
}
);
});
Ember.run(function() {
controller.set("term", "x");
});
ok(!controller.get("loading"), "loading flag is reset correctly");
ok(!controller.get("noResults"), "noResults flag is reset correctly");
ok(!controller.get("content"), "content is reset correctly");
equal(controller.get("selectedIndex"), 0, "selected index is reset correctly");
equal(controller.get("resultCount"), 0, "resultCount is reset correctly");
});
test("keyboard navigation", function() {
var controller = this.subject();
Em.run(function() {
controller.set("term", "ab");
searcherStub.resolve(
{
type: "topic",
posts: [{},{},{}],
categories: [],
topics: [],
users: [],
grouped_search_result: {},
}
);
});
equal(controller.get("selectedIndex"), 0, "initially the first item is selected");
});
test("search query / the flow of the search", function() {
var controller = this.subject();
Ember.run(function() {
controller.set("searchContext", "context");
controller.set("searchContextEnabled", true);
controller.set("term", "ab");
});
ok(Discourse.Search.forTerm.calledWithExactly(
"ab",
{
searchContext: "context",
typeFilter: null
}
), "when an initial search (with term but without a type filter) is issued, query is built correctly and results are refreshed");
ok(!controller.get("showCancelFilter"), "when an initial search (with term but without a type filter) is issued, showCancelFilter flag is false");
Discourse.Search.forTerm.reset();
Ember.run(function() {
controller.send("moreOfType", "topic");
});
ok(Discourse.Search.forTerm.calledWithExactly(
"ab",
{
searchContext: "context",
typeFilter: "topic"
}
), "when after the initial search a type filter is applied (moreOfType action is invoked), query is built correctly and results are refreshed");
ok(!controller.get("showCancelFilter"), "when after the initial search a type filter is applied (moreOfType action is invoked) but the results did not yet finished loading, showCancelFilter flag is still false");
Ember.run(function() {
searcherStub.resolve([]);
});
ok(controller.get("showCancelFilter"), "when after the initial search a type filter is applied (moreOfType action is invoked) and the results finished loading, showCancelFilter flag is set to true");
Discourse.Search.forTerm.reset();
Ember.run(function() {
controller.send("cancelType");
});
ok(Discourse.Search.forTerm.calledWithExactly(
"ab",
{
searchContext: "context",
typeFilter: null
}
), "when cancelType action is invoked after the results were filtered by type, query is built correctly and results are refreshed");
ok(!controller.get("showCancelFilter"), "when cancelType action is invoked after the results were filtered by type, showCancelFilter flag is set to false");
});
test("typing new term when the results are filtered by type cancels type filter", function() {
var controller = this.subject();
Ember.run(function() {
controller.set("term", "ab");
controller.send("moreOfType", "topic");
searcherStub.resolve([]);
});
Discourse.Search.forTerm.reset();
Ember.run(function() {
controller.set("term", "xy");
});
ok(Discourse.Search.forTerm.calledWith("xy"), "a new search is issued and results are refreshed");
ok(!controller.get("showCancelFilter"), "showCancelFilter flag is set to false");
});