diff options
author | Rémy Coutable <remy@rymai.me> | 2018-08-30 17:18:01 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-08-30 17:18:01 +0200 |
commit | d004c768417ef95a4aecb58c6c241ceed1a73d8f (patch) | |
tree | 7dafc633b9592911af9657d22e0298e912a56c77 /spec/features/merge_request/user_merges_merge_request_spec.rb | |
parent | 418d35d97491af3921e8f5cca2734b0063c143a9 (diff) | |
download | gitlab-ce-d004c768417ef95a4aecb58c6c241ceed1a73d8f.tar.gz |
Reorganize issues and merge request feature specs in the same folder
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/features/merge_request/user_merges_merge_request_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_merges_merge_request_spec.rb | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_merges_merge_request_spec.rb b/spec/features/merge_request/user_merges_merge_request_spec.rb new file mode 100644 index 00000000000..6539e6e9208 --- /dev/null +++ b/spec/features/merge_request/user_merges_merge_request_spec.rb @@ -0,0 +1,43 @@ +require "spec_helper" + +describe "User merges a merge request", :js do + let(:user) { project.owner } + + before do + sign_in(user) + end + + shared_examples "fast forward merge a merge request" do + it "merges a merge request" do + expect(page).to have_content("Fast-forward merge without a merge commit").and have_button("Merge") + + page.within(".mr-state-widget") do + click_button("Merge") + end + + page.within(".status-box") do + expect(page).to have_content("Merged") + end + end + end + + context "ff-only merge" do + let(:project) { create(:project, :public, :repository, merge_requests_ff_only_enabled: true) } + + before do + visit(merge_request_path(merge_request)) + end + + context "when branch is rebased" do + let!(:merge_request) { create(:merge_request, :rebased, source_project: project) } + + it_behaves_like "fast forward merge a merge request" + end + + context "when branch is merged" do + let!(:merge_request) { create(:merge_request, :merged_target, source_project: project) } + + it_behaves_like "fast forward merge a merge request" + end + end +end |