WIP: merge request for #21783
What does this MR do?
fixes bug that prevented @group and @Project objects to be defined by moving the earlier return after objects were defined.
Are there points in the code the reviewer needs to double check?
Why was this MR needed?
filter selected option would always appear as 'ANY'.
Screenshots (if relevant)
https://media.giphy.com/media/26ufeK22J82TpRFZe/giphy.gif
Does this MR meet the acceptance criteria?
- [ x] CHANGELOG entry added
-
Documentation created/updated -
API support added - Tests
- [x ] Added for this feature/bug
- [ x] All builds are passing
-
Conform by the merge request performance guides -
Conform by the style guides -
Branch has no merge conflicts with master
(if you do - rebase it please) - [x ] Squashed related commits together
What are the relevant issue numbers?
Closes #21783 (closed)
Merge request reports
Activity
Milestone changed to %8.12
Added frontend label
@rspeicher can you take a look?
Reassigned to @rspeicher
33 end 34 35 expect(find('.js-search-group-dropdown')).to have_content(group.name 36 end 37 38 it 'shows project name after filtering' do 39 page.within('.project-filter') do 40 find('.js-search-project-dropdown').click 41 wait_for_ajax 42 43 click_link project.name_with_namespace 44 end 45 46 expect(find('.js-search-project-dropdown')).to have_content(project.name_with_namespace) 47 end 48 end 1 1 Please view this file on the master branch, on stable branches it's out of date. 2 2 3 3 v 8.12.0 (unreleased) 4 - Fixed bug that preventelabel from displaying selected option (Returned `ANY` in filter)#21783 Fixed a bug that prevented the label filter from displaying the selected option. !6464 (closed)
Edited by Robert Speicher
18 20 21 context 'search filters', js: true do 22 let(:group) { create(:group) } 23 before do 24 group.add_owner(user) 25 end 26 27 it 'shows group name after filtering' do 28 find('.js-search-group-dropdown').click 29 wait_for_ajax 30 31 page.within '.search-holder' do 32 click_link group.name 33 end 34 35 expect(find('.js-search-group-dropdown')).to have_content(group.name 31 page.within '.search-holder' do 32 click_link group.name 33 end 34 35 expect(find('.js-search-group-dropdown')).to have_content(group.name 36 end 37 38 it 'shows project name after filtering' do 39 page.within('.project-filter') do 40 find('.js-search-project-dropdown').click 41 wait_for_ajax 42 43 click_link project.name_with_namespace 44 end 45 46 expect(find('.js-search-project-dropdown')).to have_content(project.name_with_namespace) Are these two new tests actually valid? Don't we need to wait for AJAX again, or reload the page?
In other words, undo your controller change and run the specs and verify they actually fail.
Edited by Robert Speicher
Reassigned to @coding.saints20151
Added 1 commit:
- c9ee8af5 - merge request for #21783 (closed)
@coding.saints20151 I think !6277 (merged) fixed this issue already, thanks for caring!
❤️ @rymai : No prob, and i did notice that the issue was worked on. I had miscommunication while resolving it! But i learned some things along the way! So win-win for me! Keep up the great work.
Edited by username-removed-733653But i learned some things along the way! So win-win for me! Keep up the great work.
@coding.saints20151 Awesome!! Thanks so much!!