Skip to content
Snippets Groups Projects

WIP: merge request for #21783

Closed username-removed-733653 requested to merge coding.saints20151/gitlab-ce:21783-fix into master
6 unresolved threads

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?

What are the relevant issue numbers?

Closes #21783 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
49 49 data = ""
50 50
51 51 result.each_line do |line|
52 puts line;
  • @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
  • 1 1 require 'spec_helper'
    2 2
    3 3 describe "Search", feature: true do
    4 include WaitForAjax
  • 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)
  • Added 1 commit:

  • Added ~164274 label

  • @coding.saints20151 I think !6277 (merged) fixed this issue already, thanks for caring! ❤️

  • username-removed-128633 Status changed to closed

    Status changed to closed

  • @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-733653
  • But i learned some things along the way! So win-win for me! Keep up the great work.

    @coding.saints20151 Awesome!! Thanks so much!!

  • Please register or sign in to reply
    Loading