57b96eb6db
This ensures the open issues/MR count caches are refreshed properly when creating new issues or MRs. This MR also includes a change to the cache keys to ensure all caches are rebuilt on the fly. This particular problem was not caught in the test suite due to a null cache being used, resulting in all calls that would use a cache using the underlying data directly. In production the code would fail because a newly saved record returns an empty hash in #changes meaning checks such as `state_changed? || confidential_changed?` would return false for new rows, thus never updating the counters. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38061
74 lines
2.2 KiB
Ruby
74 lines
2.2 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe MergeRequests::CloseService do
|
|
let(:user) { create(:user) }
|
|
let(:user2) { create(:user) }
|
|
let(:guest) { create(:user) }
|
|
let(:merge_request) { create(:merge_request, assignee: user2) }
|
|
let(:project) { merge_request.project }
|
|
let!(:todo) { create(:todo, :assigned, user: user, project: project, target: merge_request, author: user2) }
|
|
|
|
before do
|
|
project.team << [user, :master]
|
|
project.team << [user2, :developer]
|
|
project.team << [guest, :guest]
|
|
end
|
|
|
|
describe '#execute' do
|
|
it_behaves_like 'cache counters invalidator'
|
|
|
|
context 'valid params' do
|
|
let(:service) { described_class.new(project, user, {}) }
|
|
|
|
before do
|
|
allow(service).to receive(:execute_hooks)
|
|
|
|
perform_enqueued_jobs do
|
|
@merge_request = service.execute(merge_request)
|
|
end
|
|
end
|
|
|
|
it { expect(@merge_request).to be_valid }
|
|
it { expect(@merge_request).to be_closed }
|
|
|
|
it 'executes hooks with close action' do
|
|
expect(service).to have_received(:execute_hooks)
|
|
.with(@merge_request, 'close')
|
|
end
|
|
|
|
it 'sends email to user2 about assign of new merge_request' do
|
|
email = ActionMailer::Base.deliveries.last
|
|
expect(email.to.first).to eq(user2.email)
|
|
expect(email.subject).to include(merge_request.title)
|
|
end
|
|
|
|
it 'creates system note about merge_request reassign' do
|
|
note = @merge_request.notes.last
|
|
expect(note.note).to include 'closed'
|
|
end
|
|
|
|
it 'marks todos as done' do
|
|
expect(todo.reload).to be_done
|
|
end
|
|
end
|
|
|
|
it 'refreshes the number of open merge requests for a valid MR', :use_clean_rails_memory_store_caching do
|
|
service = described_class.new(project, user, {})
|
|
|
|
expect { service.execute(merge_request) }
|
|
.to change { project.open_merge_requests_count }.from(1).to(0)
|
|
end
|
|
|
|
context 'current user is not authorized to close merge request' do
|
|
before do
|
|
perform_enqueued_jobs do
|
|
@merge_request = described_class.new(project, guest).execute(merge_request)
|
|
end
|
|
end
|
|
|
|
it 'does not close the merge request' do
|
|
expect(@merge_request).to be_open
|
|
end
|
|
end
|
|
end
|
|
end
|