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

Fix full page search tests.

This commit is contained in:
Guo Xiang Tan 2016-10-13 15:03:58 +08:00
parent b4a899b144
commit ae0db10e2d
2 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/search-advanced-options.js.es6
View File

@ -44,7 +44,7 @@ export default Em.Component.extend({
{name: I18n.t('search.advanced.post.time.after'), value: "after"} {name: I18n.t('search.advanced.post.time.after'), value: "after"}
], ],
didInsertElement() { init() {
this._super(); this._super();
this._init(); this._init();
}, },

122
test/javascripts/acceptance/search-full-test.js.es6
View File

@ -64,47 +64,47 @@ test("open advanced search", assert => {
andThen(() => assert.ok(exists('.search .search-advanced'), 'shows advanced search panel')); andThen(() => assert.ok(exists('.search .search-advanced'), 'shows advanced search panel'));
fillIn('.search input.full-page-search', 'none'); fillIn('.search input.full-page-search', 'none');
click('.search-advanced h3.panel-title'); click('.search-advanced-btn');
andThen(() => assert.ok(visible('.search-advanced .search-options'), '"search-options" is visible')); andThen(() => assert.ok(visible('.search-advanced .search-advanced-options'), '"search-advanced-options" is visible'));
}); });
test("validate population of advanced search", assert => { test("validate population of advanced search", assert => {
visit("/search"); visit("/search");
fillIn('.search input.full-page-search', 'test user:admin #bug group:moderators badge:Reader tags:monkey in:likes status:open after:5 posts_count:10'); fillIn('.search input.full-page-search', 'test user:admin #bug group:moderators badge:Reader tags:monkey in:likes status:open after:5 posts_count:10');
click('.search-advanced h3.panel-title'); click('.search-advanced-btn');
andThen(() => { andThen(() => {
assert.ok(exists('.search-options span:contains("admin")'), 'has "admin" pre-populated'); assert.ok(exists('.search-advanced-options span:contains("admin")'), 'has "admin" pre-populated');
assert.ok(exists('.search-options .category-combobox .select2-choice .select2-chosen:contains("bug")'), 'has "bug" pre-populated'); assert.ok(exists('.search-advanced-options .category-combobox .select2-choice .select2-chosen:contains("bug")'), 'has "bug" pre-populated');
//assert.ok(exists('.search-options span:contains("moderators")'), 'has "moderators" pre-populated'); //assert.ok(exists('.search-advanced-options span:contains("moderators")'), 'has "moderators" pre-populated');
//assert.ok(exists('.search-options span:contains("Reader")'), 'has "Reader" pre-populated'); //assert.ok(exists('.search-advanced-options span:contains("Reader")'), 'has "Reader" pre-populated');
assert.ok(exists('.search-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated'); assert.ok(exists('.search-advanced-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated');
assert.ok(exists('.search-options .combobox .select2-choice .select2-chosen:contains("I liked")'), 'has "I liked" pre-populated'); assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("I liked")'), 'has "I liked" pre-populated');
assert.ok(exists('.search-options .combobox .select2-choice .select2-chosen:contains("are open")'), 'has "are open" pre-populated'); assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("are open")'), 'has "are open" pre-populated');
assert.ok(exists('.search-options .combobox .select2-choice .select2-chosen:contains("after")'), 'has "after" pre-populated'); assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("after")'), 'has "after" pre-populated');
assert.equal(find('.search-options #search-post-date').val(), "5", 'has "5" pre-populated'); assert.equal(find('.search-advanced-options #search-post-date').val(), "5", 'has "5" pre-populated');
assert.equal(find('.search-options #search-posts-count').val(), "10", 'has "10" pre-populated'); assert.equal(find('.search-advanced-options #search-posts-count').val(), "10", 'has "10" pre-populated');
}); });
}); });
test("update username through advanced search ui", assert => { test("update username through advanced search ui", assert => {
visit("/search"); visit("/search");
fillIn('.search input.full-page-search', 'none'); fillIn('.search input.full-page-search', 'none');
click('.search-advanced h3.panel-title'); click('.search-advanced-btn');
fillIn('.search-options .user-selector', 'admin'); fillIn('.search-advanced-options .user-selector', 'admin');
click('.search-options .user-selector'); click('.search-advanced-options .user-selector');
keyEvent('.search-options .user-selector', 'keydown', 8); keyEvent('.search-advanced-options .user-selector', 'keydown', 8);
andThen(() => { andThen(() => {
waitFor(() => { waitFor(() => {
assert.ok(visible('.search-options .autocomplete'), '"autocomplete" popup is visible'); assert.ok(visible('.search-advanced-options .autocomplete'), '"autocomplete" popup is visible');
assert.ok(exists('.search-options .autocomplete ul li a span.username:contains("admin")'), '"autocomplete" popup has an entry for "admin"'); assert.ok(exists('.search-advanced-options .autocomplete ul li a span.username:contains("admin")'), '"autocomplete" popup has an entry for "admin"');
click('.search-options .autocomplete ul li a:first'); click('.search-advanced-options .autocomplete ul li a:first');
andThen(() => { andThen(() => {
assert.ok(exists('.search-options span:contains("admin")'), 'has "admin" pre-populated'); assert.ok(exists('.search-advanced-options span:contains("admin")'), 'has "admin" pre-populated');
assert.equal(find('.search input.full-page-search').val(), "none @admin", 'has updated search term to "none user:admin"'); assert.equal(find('.search input.full-page-search').val(), "none @admin", 'has updated search term to "none user:admin"');
}); });
}); });
@ -114,12 +114,12 @@ test("update username through advanced search ui", assert => {
test("update category through advanced search ui", assert => { test("update category through advanced search ui", assert => {
visit("/search"); visit("/search");
fillIn('.search input.full-page-search', 'none'); fillIn('.search input.full-page-search', 'none');
click('.search-advanced h3.panel-title'); click('.search-advanced-btn');
selectDropdown('.search-options .category-combobox', 4); selectDropdown('.search-advanced-options .category-combobox', 4);
click('.search-options'); // need to click off the combobox for the search-term to get updated click('.search-advanced-options'); // need to click off the combobox for the search-term to get updated
andThen(() => { andThen(() => {
assert.ok(exists('.search-options .category-combobox .select2-choice .select2-chosen:contains("faq")'), 'has "faq" populated'); assert.ok(exists('.search-advanced-options .category-combobox .select2-choice .select2-chosen:contains("faq")'), 'has "faq" populated');
assert.equal(find('.search input.full-page-search').val(), "none #faq", 'has updated search term to "none #faq"'); assert.equal(find('.search input.full-page-search').val(), "none #faq", 'has updated search term to "none #faq"');
}); });
}); });
@ -127,20 +127,20 @@ test("update category through advanced search ui", assert => {
// test("update group through advanced search ui", assert => { // test("update group through advanced search ui", assert => {
// visit("/search"); // visit("/search");
// fillIn('.search input.full-page-search', 'none'); // fillIn('.search input.full-page-search', 'none');
// click('.search-advanced h3.panel-title'); // click('.search-advanced-btn');
// fillIn('.search-options .group-selector', 'moderators'); // fillIn('.search-advanced-options .group-selector', 'moderators');
// click('.search-options .group-selector'); // click('.search-advanced-options .group-selector');
// keyEvent('.search-options .group-selector', 'keydown', 8); // keyEvent('.search-advanced-options .group-selector', 'keydown', 8);
// //
// andThen(() => { // andThen(() => {
// waitFor(() => { // waitFor(() => {
// assert.ok(visible('.search-options .autocomplete'), '"autocomplete" popup is visible'); // assert.ok(visible('.search-advanced-options .autocomplete'), '"autocomplete" popup is visible');
// assert.ok(exists('.search-options .autocomplete ul li a:contains("moderators")'), '"autocomplete" popup has an entry for "moderators"'); // assert.ok(exists('.search-advanced-options .autocomplete ul li a:contains("moderators")'), '"autocomplete" popup has an entry for "moderators"');
// //
// click('.search-options .autocomplete ul li a:first'); // click('.search-advanced-options .autocomplete ul li a:first');
// //
// andThen(() => { // andThen(() => {
// assert.ok(exists('.search-options span:contains("moderators")'), 'has "moderators" pre-populated'); // assert.ok(exists('.search-advanced-options span:contains("moderators")'), 'has "moderators" pre-populated');
// assert.equal(find('.search input.full-page-search').val(), "none group:moderators", 'has updated search term to "none group:moderators"'); // assert.equal(find('.search input.full-page-search').val(), "none group:moderators", 'has updated search term to "none group:moderators"');
// }); // });
// }); // });
@ -150,20 +150,20 @@ test("update category through advanced search ui", assert => {
// test("update badges through advanced search ui", assert => { // test("update badges through advanced search ui", assert => {
// visit("/search"); // visit("/search");
// fillIn('.search input.full-page-search', 'none'); // fillIn('.search input.full-page-search', 'none');
// click('.search-advanced h3.panel-title'); // click('.search-advanced-btn');
// fillIn('.search-options .badge-names', 'Reader'); // fillIn('.search-advanced-options .badge-names', 'Reader');
// click('.search-options .badge-names'); // click('.search-advanced-options .badge-names');
// keyEvent('.search-options .badge-names', 'keydown', 8); // keyEvent('.search-advanced-options .badge-names', 'keydown', 8);
// //
// andThen(() => { // andThen(() => {
// waitFor(() => { // waitFor(() => {
// assert.ok(visible('.search-options .autocomplete'), '"autocomplete" popup is visible'); // assert.ok(visible('.search-advanced-options .autocomplete'), '"autocomplete" popup is visible');
// assert.ok(exists('.search-options .autocomplete ul li a:contains("Reader")'), '"autocomplete" popup has an entry for "Reader"'); // assert.ok(exists('.search-advanced-options .autocomplete ul li a:contains("Reader")'), '"autocomplete" popup has an entry for "Reader"');
// //
// click('.search-options .autocomplete ul li a:first'); // click('.search-advanced-options .autocomplete ul li a:first');
// //
// andThen(() => { // andThen(() => {
// assert.ok(exists('.search-options span:contains("Reader")'), 'has "Reader" pre-populated'); // assert.ok(exists('.search-advanced-options span:contains("Reader")'), 'has "Reader" pre-populated');
// assert.equal(find('.search input.full-page-search').val(), "none badge:Reader", 'has updated search term to "none badge:Reader"'); // assert.equal(find('.search input.full-page-search').val(), "none badge:Reader", 'has updated search term to "none badge:Reader"');
// }); // });
// }); // });
@ -173,17 +173,17 @@ test("update category through advanced search ui", assert => {
// test("update tags through advanced search ui", assert => { // test("update tags through advanced search ui", assert => {
// visit("/search"); // visit("/search");
// fillIn('.search input.full-page-search', 'none'); // fillIn('.search input.full-page-search', 'none');
// click('.search-advanced h3.panel-title'); // click('.search-advanced-btn');
// //
// keyEvent('.search-options .tag-chooser input.select2-input', 'keydown', 110); // keyEvent('.search-advanced-options .tag-chooser input.select2-input', 'keydown', 110);
// fillIn('.search-options .tag-chooser input.select2-input', 'monkey'); // fillIn('.search-advanced-options .tag-chooser input.select2-input', 'monkey');
// keyEvent('.search-options .tag-chooser input.select2-input', 'keyup', 110); // keyEvent('.search-advanced-options .tag-chooser input.select2-input', 'keyup', 110);
// //
// andThen(() => { // andThen(() => {
// waitFor(() => { // waitFor(() => {
// click('li.select2-result-selectable:first'); // click('li.select2-result-selectable:first');
// andThen(() => { // andThen(() => {
// assert.ok(exists('.search-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated'); // assert.ok(exists('.search-advanced-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated');
// assert.equal(find('.search input.full-page-search').val(), "none tags:monkey", 'has updated search term to "none tags:monkey"'); // assert.equal(find('.search input.full-page-search').val(), "none tags:monkey", 'has updated search term to "none tags:monkey"');
// }); // });
// }); // });
@ -193,12 +193,12 @@ test("update category through advanced search ui", assert => {
test("update in filter through advanced search ui", assert => { test("update in filter through advanced search ui", assert => {
visit("/search"); visit("/search");
fillIn('.search input.full-page-search', 'none'); fillIn('.search input.full-page-search', 'none');
click('.search-advanced h3.panel-title'); click('.search-advanced-btn');
selectDropdown('.search-options #s2id_in', 'likes'); selectDropdown('.search-advanced-options #s2id_in', 'likes');
fillIn('.search-options #in', 'likes'); fillIn('.search-advanced-options #in', 'likes');
andThen(() => { andThen(() => {
assert.ok(exists('.search-options #s2id_in .select2-choice .select2-chosen:contains("I liked")'), 'has "I liked" populated'); assert.ok(exists('.search-advanced-options #s2id_in .select2-choice .select2-chosen:contains("I liked")'), 'has "I liked" populated');
assert.equal(find('.search input.full-page-search').val(), "none in:likes", 'has updated search term to "none in:likes"'); assert.equal(find('.search input.full-page-search').val(), "none in:likes", 'has updated search term to "none in:likes"');
}); });
}); });
@ -206,12 +206,12 @@ test("update in filter through advanced search ui", assert => {
test("update status through advanced search ui", assert => { test("update status through advanced search ui", assert => {
visit("/search"); visit("/search");
fillIn('.search input.full-page-search', 'none'); fillIn('.search input.full-page-search', 'none');
click('.search-advanced h3.panel-title'); click('.search-advanced-btn');
selectDropdown('.search-options #s2id_status', 'closed'); selectDropdown('.search-advanced-options #s2id_status', 'closed');
fillIn('.search-options #status', 'closed'); fillIn('.search-advanced-options #status', 'closed');
andThen(() => { andThen(() => {
assert.ok(exists('.search-options #s2id_status .select2-choice .select2-chosen:contains("are closed")'), 'has "are closed" populated'); assert.ok(exists('.search-advanced-options #s2id_status .select2-choice .select2-chosen:contains("are closed")'), 'has "are closed" populated');
assert.equal(find('.search input.full-page-search').val(), "none status:closed", 'has updated search term to "none status:closed"'); assert.equal(find('.search input.full-page-search').val(), "none status:closed", 'has updated search term to "none status:closed"');
}); });
}); });
@ -219,14 +219,14 @@ test("update status through advanced search ui", assert => {
test("update post time through advanced search ui", assert => { test("update post time through advanced search ui", assert => {
visit("/search"); visit("/search");
fillIn('.search input.full-page-search', 'none'); fillIn('.search input.full-page-search', 'none');
click('.search-advanced h3.panel-title'); click('.search-advanced-btn');
fillIn('#search-post-date', '5'); fillIn('#search-post-date', '5');
selectDropdown('.search-options #s2id_postTime', 'after'); selectDropdown('.search-advanced-options #s2id_postTime', 'after');
fillIn('.search-options #postTime', 'after'); fillIn('.search-advanced-options #postTime', 'after');
andThen(() => { andThen(() => {
assert.ok(exists('.search-options #s2id_postTime .select2-choice .select2-chosen:contains("after")'), 'has "after" populated'); assert.ok(exists('.search-advanced-options #s2id_postTime .select2-choice .select2-chosen:contains("after")'), 'has "after" populated');
assert.equal(find('.search-options #search-post-date').val(), "5", 'has "5" populated'); assert.equal(find('.search-advanced-options #search-post-date').val(), "5", 'has "5" populated');
assert.equal(find('.search input.full-page-search').val(), "none after:5", 'has updated search term to "none after:5"'); assert.equal(find('.search input.full-page-search').val(), "none after:5", 'has updated search term to "none after:5"');
}); });
}); });
@ -234,11 +234,11 @@ test("update post time through advanced search ui", assert => {
test("update posts count through advanced search ui", assert => { test("update posts count through advanced search ui", assert => {
visit("/search"); visit("/search");
fillIn('.search input.full-page-search', 'none'); fillIn('.search input.full-page-search', 'none');
click('.search-advanced h3.panel-title'); click('.search-advanced-btn');
fillIn('#search-posts-count', '5'); fillIn('#search-posts-count', '5');
andThen(() => { andThen(() => {
assert.equal(find('.search-options #search-posts-count').val(), "5", 'has "5" populated'); assert.equal(find('.search-advanced-options #search-posts-count').val(), "5", 'has "5" populated');
assert.equal(find('.search input.full-page-search').val(), "none posts_count:5", 'has updated search term to "none posts_count:5"'); assert.equal(find('.search input.full-page-search').val(), "none posts_count:5", 'has updated search term to "none posts_count:5"');
}); });
}); });