diff options
Diffstat (limited to 'spec/features/merge_requests/cherry_pick_spec.rb')
-rw-r--r-- | spec/features/merge_requests/cherry_pick_spec.rb | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/spec/features/merge_requests/cherry_pick_spec.rb b/spec/features/merge_requests/cherry_pick_spec.rb deleted file mode 100644 index 205e38337d1..00000000000 --- a/spec/features/merge_requests/cherry_pick_spec.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'spec_helper' - -describe 'Cherry-pick Merge Requests', :js do - let(:user) { create(:user) } - let(:group) { create(:group) } - let(:project) { create(:project, :repository, namespace: group) } - let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) } - - before do - sign_in user - project.add_master(user) - end - - context "Viewing a merged merge request" do - before do - service = MergeRequests::MergeService.new(project, user) - - perform_enqueued_jobs do - service.execute(merge_request) - end - end - - # Fast-forward merge, or merged before GitLab 8.5. - context "Without a merge commit" do - before do - merge_request.merge_commit_sha = nil - merge_request.save - end - - it "doesn't show a Cherry-pick button" do - visit project_merge_request_path(project, merge_request) - - expect(page).not_to have_link "Cherry-pick" - end - end - - context "With a merge commit" do - it "shows a Cherry-pick button" do - visit project_merge_request_path(project, merge_request) - - expect(page).to have_link "Cherry-pick" - end - end - end -end |