diff options
author | jurre <jurrestender+github@gmail.com> | 2016-12-22 19:45:36 +0100 |
---|---|---|
committer | jurre <jurrestender+github@gmail.com> | 2017-01-19 12:30:35 +0100 |
commit | ea7bf7eda44db68b6a8aadfff3afe8117a510989 (patch) | |
tree | 7e59091f753badeefb30743dd3e2ed7d3f9b5f11 /spec/features | |
parent | e59623e7388d67433ede87db1dad134f6f176f98 (diff) | |
download | gitlab-ce-ea7bf7eda44db68b6a8aadfff3afe8117a510989.tar.gz |
Show a custom WIP help message for MR's with WIP commits
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_requests/wip_message_spec.rb | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/spec/features/merge_requests/wip_message_spec.rb b/spec/features/merge_requests/wip_message_spec.rb new file mode 100644 index 00000000000..3311731b33b --- /dev/null +++ b/spec/features/merge_requests/wip_message_spec.rb @@ -0,0 +1,63 @@ +require 'spec_helper' + +feature 'Work In Progress help message', feature: true do + let!(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } + let!(:user) { create(:user) } + + before do + project.team << [user, :master] + login_as(user) + end + + context 'with WIP commits' do + it 'shows a specific WIP hint' do + visit new_namespace_project_merge_request_path( + project.namespace, + project, + merge_request: { + source_project_id: project.id, + target_project_id: project.id, + source_branch: 'wip', + target_branch: 'master' + } + ) + + within_wip_explanation do + expect(page).to have_text( + 'It looks like you have some WIP commits in this branch' + ) + end + end + end + + context 'without WIP commits' do + it 'shows the regular WIP message' do + visit new_namespace_project_merge_request_path( + project.namespace, + project, + merge_request: { + source_project_id: project.id, + target_project_id: project.id, + source_branch: 'fix', + target_branch: 'master' + } + ) + + within_wip_explanation do + expect(page).not_to have_text( + 'It looks like you have some WIP commits in this branch' + ) + expect(page).to have_text( + "Start the title with WIP: to prevent a Work In Progress merge \ +request from being merged before it's ready" + ) + end + end + end + + def within_wip_explanation(&block) + page.within '.js-no-wip-explanation' do + yield + end + end +end |