diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-16 19:43:10 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-17 11:26:33 +0800 |
| commit | 2da8b5dc6f62dd72a74673172c30715b2e6af478 (patch) | |
| tree | 3d1122ff4cd45ae1b5561aa76ba58e79cd7d2d40 | |
| parent | e6766053b37023d298651c2fc7f5a676c9ddad5f (diff) | |
| download | gitlab-ce-2da8b5dc6f62dd72a74673172c30715b2e6af478.tar.gz | |
Merge branch 'compare-remote-search' into 'master'
Enabled remote filter in compare dropdowns
Closes #29545
See merge request !9997
| -rw-r--r-- | app/assets/javascripts/compare_autocomplete.js | 5 | ||||
| -rw-r--r-- | spec/features/projects/compare_spec.rb | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/compare_autocomplete.js b/app/assets/javascripts/compare_autocomplete.js index 1eca973e069..6eeb3ff3801 100644 --- a/app/assets/javascripts/compare_autocomplete.js +++ b/app/assets/javascripts/compare_autocomplete.js @@ -19,7 +19,8 @@ return $.ajax({ url: $dropdown.data('refs-url'), data: { - ref: $dropdown.data('ref') + ref: $dropdown.data('ref'), + search: term, } }).done(function(refs) { return callback(refs); @@ -27,7 +28,7 @@ }, selectable: true, filterable: true, - filterByText: true, + filterRemote: true, fieldName: $dropdown.data('field-name'), filterInput: 'input[type="search"]', renderRow: function(ref) { diff --git a/spec/features/projects/compare_spec.rb b/spec/features/projects/compare_spec.rb index 43eb4000e58..030043d14aa 100644 --- a/spec/features/projects/compare_spec.rb +++ b/spec/features/projects/compare_spec.rb @@ -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 |