diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-14 15:06:08 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-14 15:06:08 +0000 |
commit | d88843f370acfcbbd3e2b9d6d662d62132647d86 (patch) | |
tree | 9594bad83068245c57d592c9dabd47793b3a755b /qa/qa/specs/features/browser_ui/3_create | |
parent | d8c06be498acbfc2024c01b6b6b02d120dc499f2 (diff) | |
download | gitlab-ce-d88843f370acfcbbd3e2b9d6d662d62132647d86.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/specs/features/browser_ui/3_create')
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb index bb1e3ced333..3306c5f5c50 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb @@ -66,24 +66,22 @@ module QA expect(page).to have_content(commit_message_of_second_branch) expect(page).to have_content(commit_message_of_third_branch) - Page::Project::Branches::Show.perform do |branches| - expect(branches).to have_branch_with_badge(second_branch, 'merged') - end + Page::Project::Branches::Show.perform do |branches_page| + expect(branches_page).to have_branch_with_badge(second_branch, 'merged') - Page::Project::Branches::Show.perform do |branches_view| - branches_view.delete_branch(third_branch) - expect(branches_view).to have_no_branch(third_branch) - end + branches_page.delete_branch(third_branch) + + expect(branches_page).to have_no_branch(third_branch) + + branches_page.delete_merged_branches - Page::Project::Branches::Show.perform(&:delete_merged_branches) + expect(branches_page).to have_content( + 'Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes.' + ) - expect(page).to have_content( - 'Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes.' - ) + branches_page.refresh - page.refresh - Page::Project::Branches::Show.perform do |branches_view| - expect(branches_view).to have_no_branch(second_branch, reload: true) + expect(branches_page).to have_no_branch(second_branch, reload: true) end end end |