VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-08-20 14:11:11 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'compare-remote-search' into 'master'

Browse Source 
Enabled remote filter in compare dropdowns

Closes #29545

See merge request !9997
This commit is contained in:
Alfredo Sumaran
2017-03-16 19:43:10 +00:00
parent adb7ed3f9a de14439ea4
commit c2d3ea04f6
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/compare_autocomplete.js
View File

@ -18,7 +18,8 @@ window.CompareAutocomplete = (function() {
return $.ajax({
url: $dropdown.data('refs-url'),
data: {
ref: $dropdown.data('ref')
ref: $dropdown.data('ref'),
search: term,
}
}).done(function(refs) {
return callback(refs);
@ -26,7 +27,7 @@ window.CompareAutocomplete = (function() {
},
selectable: true,
filterable: true,
filterByText: true,
filterRemote: true,
fieldName: $dropdown.data('field-name'),
filterInput: 'input[type="search"]',
renderRow: function(ref) {

8
spec/features/projects/compare_spec.rb
View File

@ -26,6 +26,14 @@ describe "Compare", js: true do
click_button "Compare"
expect(page).to have_content "Commits"
end
it "filters branches" do
select_using_dropdown("from", "wip")
find(".js-compare-from-dropdown .compare-dropdown-toggle").click
expect(find(".js-compare-from-dropdown .dropdown-content")).to have_selector("li", count: 3)
end
end
describe "tags" do