diff options
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! |