diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-07-06 14:38:24 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-07-06 14:38:24 +0900 |
| commit | 25bd5413200c9cd9368c753e2752f07735604547 (patch) | |
| tree | c4cc75a53face6a6d0da8adca9a3994d3cc688b5 /qa/qa/specs/features/merge_request/squash_spec.rb | |
| parent | b025e89e08888f3b393108f984a25c209526491b (diff) | |
| parent | 969b7c565c6fe5cdfc54830d1da35f254ddaf530 (diff) | |
| download | gitlab-ce-25bd5413200c9cd9368c753e2752f07735604547.tar.gz | |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'qa/qa/specs/features/merge_request/squash_spec.rb')
| -rw-r--r-- | qa/qa/specs/features/merge_request/squash_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/qa/specs/features/merge_request/squash_spec.rb b/qa/qa/specs/features/merge_request/squash_spec.rb index b68704154cf..4856bbe1a69 100644 --- a/qa/qa/specs/features/merge_request/squash_spec.rb +++ b/qa/qa/specs/features/merge_request/squash_spec.rb @@ -1,6 +1,6 @@ module QA - feature 'merge request squash commits', :core do - scenario 'when squash commits is marked before merge' do + describe 'merge request squash commits', :core do + it 'when squash commits is marked before merge' do Runtime::Browser.visit(:gitlab, Page::Main::Login) Page::Main::Login.act { sign_in_using_credentials } @@ -24,6 +24,8 @@ module QA merge_request.visit! + expect(page).to have_text('to be squashed') + Page::MergeRequest::Show.perform do |merge_request_page| merge_request_page.mark_to_squash merge_request_page.merge! |