Merge branch 'ce-6571-single-codebase' into 'master'
CE-port of 6571-single-codebase See merge request gitlab-org/gitlab-ce!26355
This commit is contained in:
commit
2269710ba5
1 changed files with 11 additions and 0 deletions
|
@ -497,12 +497,21 @@ describe 'Issues' do
|
||||||
|
|
||||||
it 'allows user to unselect themselves', :js do
|
it 'allows user to unselect themselves', :js do
|
||||||
issue2 = create(:issue, project: project, author: user)
|
issue2 = create(:issue, project: project, author: user)
|
||||||
|
|
||||||
visit project_issue_path(project, issue2)
|
visit project_issue_path(project, issue2)
|
||||||
|
|
||||||
|
def close_dropdown_menu_if_visible
|
||||||
|
find('.dropdown-menu-toggle', visible: :all).tap do |toggle|
|
||||||
|
toggle.click if toggle.visible?
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
page.within '.assignee' do
|
page.within '.assignee' do
|
||||||
click_link 'Edit'
|
click_link 'Edit'
|
||||||
click_link user.name
|
click_link user.name
|
||||||
|
|
||||||
|
close_dropdown_menu_if_visible
|
||||||
|
|
||||||
page.within '.value .author' do
|
page.within '.value .author' do
|
||||||
expect(page).to have_content user.name
|
expect(page).to have_content user.name
|
||||||
end
|
end
|
||||||
|
@ -510,6 +519,8 @@ describe 'Issues' do
|
||||||
click_link 'Edit'
|
click_link 'Edit'
|
||||||
click_link user.name
|
click_link user.name
|
||||||
|
|
||||||
|
close_dropdown_menu_if_visible
|
||||||
|
|
||||||
page.within '.value .assign-yourself' do
|
page.within '.value .assign-yourself' do
|
||||||
expect(page).to have_content "No assignee"
|
expect(page).to have_content "No assignee"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue