diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-16 17:33:47 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-16 17:33:47 +0000 |
| commit | 890832653dcf63c530ee5dcbd6782461173369bf (patch) | |
| tree | c0ac8657a2923d410044cb23e0f43da65155a6d1 | |
| parent | 83c48a40046879e8e28e13eeb8d2779fc797ffff (diff) | |
| parent | 8e4a23927ef848dc0564eecb83ea857d18d2f877 (diff) | |
| download | gitlab-ce-890832653dcf63c530ee5dcbd6782461173369bf.tar.gz | |
Merge branch 'fixed-issue-boards-modal-not-searching' into 'master'
Fixed search not working in issue boards modal
See merge request !10010
| -rw-r--r-- | app/assets/javascripts/filtered_search/dropdown_utils.js | 2 | ||||
| -rw-r--r-- | spec/features/boards/add_issues_modal_spec.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_utils.js b/app/assets/javascripts/filtered_search/dropdown_utils.js index 59998c2108c..432b0c0dfd2 100644 --- a/app/assets/javascripts/filtered_search/dropdown_utils.js +++ b/app/assets/javascripts/filtered_search/dropdown_utils.js @@ -117,7 +117,7 @@ import FilteredSearchContainer from './container'; const { isLastVisualTokenValid } = gl.FilteredSearchVisualTokens.getLastVisualTokenBeforeInput(); - const input = document.querySelector('.filtered-search'); + const input = FilteredSearchContainer.container.querySelector('.filtered-search'); const inputValue = input && input.value; if (isLastVisualTokenValid) { diff --git a/spec/features/boards/add_issues_modal_spec.rb b/spec/features/boards/add_issues_modal_spec.rb index c87c0632cb5..d17a418b8c3 100644 --- a/spec/features/boards/add_issues_modal_spec.rb +++ b/spec/features/boards/add_issues_modal_spec.rb @@ -109,6 +109,8 @@ describe 'Issue Boards add issue modal', :feature, :js do find('.form-control').native.send_keys(issue.title) find('.form-control').native.send_keys(:enter) + wait_for_vue_resource + expect(page).to have_selector('.card', count: 1) end end @@ -118,6 +120,8 @@ describe 'Issue Boards add issue modal', :feature, :js do find('.form-control').native.send_keys('testing search') find('.form-control').native.send_keys(:enter) + wait_for_vue_resource + expect(page).not_to have_selector('.card') expect(page).not_to have_content("You haven't added any issues to your project yet") end |