debian-mirror-gitlab/spec/features/merge_request/user_merges_merge_request_spec.rb

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

64 lines
1.8 KiB
Ruby
Raw Normal View History

2019-09-04 21:01:54 +05:30
# frozen_string_literal: true
2018-11-08 19:23:39 +05:30
require "spec_helper"
2020-06-23 00:09:42 +05:30
RSpec.describe "User merges a merge request", :js do
2022-04-04 11:22:00 +05:30
let(:user) { project.first_owner }
2018-11-08 19:23:39 +05:30
before do
sign_in(user)
end
shared_examples "fast forward merge a merge request" do
2022-06-21 17:19:12 +05:30
it "merges a merge request", :sidekiq_inline do
2018-11-08 19:23:39 +05:30
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
2022-07-16 23:28:13 +05:30
expect(page).to have_selector('.gl-badge', text: 'Merged')
2018-11-08 19:23:39 +05:30
end
end
context "ff-only merge" do
let(:project) { create(:project, :public, :repository, merge_requests_ff_only_enabled: true) }
before do
2022-07-16 23:28:13 +05:30
stub_feature_flags(restructured_mr_widget: false)
2018-11-08 19:23:39 +05:30
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
2022-06-21 17:19:12 +05:30
context 'sidebar merge requests counter' do
let(:project) { create(:project, :public, :repository) }
let!(:merge_request) { create(:merge_request, source_project: project) }
it 'decrements the open MR count', :sidekiq_inline do
create(:merge_request, source_project: project, source_branch: 'branch-1')
visit(merge_request_path(merge_request))
expect(page).to have_css('.js-merge-counter', text: '2')
page.within(".mr-state-widget") do
click_button("Merge")
end
expect(page).to have_css('.js-merge-counter', text: '1')
end
end
2018-11-08 19:23:39 +05:30
end