diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-08 01:17:55 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-08 01:17:55 +0300 |
| commit | b69ade5dd1eca99bff388240a184b6a579196f9d (patch) | |
| tree | bc568a5af275a74d29c92235a9695f47aca13378 /spec/features | |
| parent | 4ac42e48344d4971913e8ed4afca27d0bdf07929 (diff) | |
| parent | 3063225ca289e87c3f590e1722451a1c674e2ac9 (diff) | |
Merge branch '43557-osw-present-merge-sha-commit' into 'master'
Resolve "Display merge commit SHA in merge widget after merge"
Closes #43557
See merge request gitlab-org/gitlab-ce!18722
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb b/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb index c35ba2d7016..01aeed93947 100644 --- a/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb +++ b/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb @@ -10,6 +10,15 @@ describe 'User accepts a merge request', :js do sign_in(user) end + it 'presents merged merge request content' do + visit(merge_request_path(merge_request)) + + click_button('Merge') + + expect(page).to have_content("The changes were merged into #{merge_request.target_branch} with \ + #{merge_request.short_merge_commit_sha}") + end + context 'with removing the source branch' do before do visit(merge_request_path(merge_request)) |