2019-04-11 08:17:24 -04:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2013-02-25 14:21:38 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2019-03-22 13:01:48 -04:00
|
|
|
describe Git::BranchPushService, services: true do
|
2014-08-01 08:11:27 -04:00
|
|
|
include RepoHelpers
|
|
|
|
|
Add repository languages for projects
Our friends at GitHub show the programming languages for a long time,
and inspired by that this commit means to create about the same
functionality.
Language detection is done through Linguist, as before, where the
difference is that we cache the result in the database. Also, Gitaly can
incrementaly scan a repository. This is done through a shell out, which
creates overhead of about 3s each run. For now this won't be improved.
Scans are triggered by pushed to the default branch, usually `master`.
However, one exception to this rule the charts page. If we're requesting
this expensive data anyway, we just cache it in the database.
Edge cases where there is no repository, or its empty are caught in the
Repository model. This makes use of Redis caching, which is probably
already loaded.
The added model is called RepositoryLanguage, which will make it harder
if/when GitLab supports multiple repositories per project. However, for
now I think this shouldn't be a concern. Also, Language could be
confused with the i18n languages and felt like the current name was
suiteable too.
Design of the Project#Show page is done with help from @dimitrieh. This
change is not visible to the end user unless detections are done.
2018-06-06 07:10:59 -04:00
|
|
|
set(:user) { create(:user) }
|
|
|
|
set(:project) { create(:project, :repository) }
|
2017-05-02 05:58:08 -04:00
|
|
|
let(:blankrev) { Gitlab::Git::BLANK_SHA }
|
|
|
|
let(:oldrev) { sample_commit.parent_id }
|
|
|
|
let(:newrev) { sample_commit.id }
|
2019-03-28 10:59:24 -04:00
|
|
|
let(:branch) { 'master' }
|
|
|
|
let(:ref) { "refs/heads/#{branch}" }
|
2013-02-25 14:21:38 -05:00
|
|
|
|
|
|
|
before do
|
2018-07-11 10:36:08 -04:00
|
|
|
project.add_maintainer(user)
|
2013-02-25 14:21:38 -05:00
|
|
|
end
|
|
|
|
|
2014-09-26 05:55:57 -04:00
|
|
|
describe 'Push branches' do
|
2016-02-17 12:29:43 -05:00
|
|
|
subject do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-02-17 12:29:43 -05:00
|
|
|
end
|
|
|
|
|
2014-09-26 05:55:57 -04:00
|
|
|
context 'new branch' do
|
2017-05-02 05:58:08 -04:00
|
|
|
let(:oldrev) { blankrev }
|
2014-09-26 05:55:57 -04:00
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { is_expected.to be_truthy }
|
2016-02-08 06:50:55 -05:00
|
|
|
|
2016-11-18 08:04:18 -05:00
|
|
|
it 'calls the after_push_commit hook' do
|
|
|
|
expect(project.repository).to receive(:after_push_commit).with('master')
|
2016-02-08 06:50:55 -05:00
|
|
|
|
|
|
|
subject
|
|
|
|
end
|
|
|
|
|
2016-11-18 08:04:18 -05:00
|
|
|
it 'calls the after_create_branch hook' do
|
|
|
|
expect(project.repository).to receive(:after_create_branch)
|
2016-06-28 05:39:29 -04:00
|
|
|
|
|
|
|
subject
|
|
|
|
end
|
2014-09-26 05:55:57 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'existing branch' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { is_expected.to be_truthy }
|
2016-02-08 06:50:55 -05:00
|
|
|
|
2016-11-18 08:04:18 -05:00
|
|
|
it 'calls the after_push_commit hook' do
|
|
|
|
expect(project.repository).to receive(:after_push_commit).with('master')
|
2016-06-28 05:39:29 -04:00
|
|
|
|
|
|
|
subject
|
|
|
|
end
|
2014-09-26 05:55:57 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'rm branch' do
|
2017-05-02 05:58:08 -04:00
|
|
|
let(:newrev) { blankrev }
|
2014-09-26 05:55:57 -04:00
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { is_expected.to be_truthy }
|
2016-02-08 06:50:55 -05:00
|
|
|
|
2016-11-18 08:04:18 -05:00
|
|
|
it 'calls the after_push_commit hook' do
|
|
|
|
expect(project.repository).to receive(:after_push_commit).with('master')
|
2016-06-28 05:39:29 -04:00
|
|
|
|
|
|
|
subject
|
|
|
|
end
|
|
|
|
|
2016-11-18 08:04:18 -05:00
|
|
|
it 'calls the after_remove_branch hook' do
|
|
|
|
expect(project.repository).to receive(:after_remove_branch)
|
2016-02-08 06:50:55 -05:00
|
|
|
|
|
|
|
subject
|
|
|
|
end
|
2014-09-26 05:55:57 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-05-24 09:13:51 -04:00
|
|
|
describe "Pipelines" do
|
2019-10-03 11:07:07 -04:00
|
|
|
subject { execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref) }
|
2017-05-24 09:13:51 -04:00
|
|
|
|
|
|
|
before do
|
|
|
|
stub_ci_pipeline_to_return_yaml_file
|
|
|
|
end
|
|
|
|
|
2019-08-17 03:42:23 -04:00
|
|
|
it 'creates a pipeline with the right parameters' do
|
|
|
|
expect(Ci::CreatePipelineService)
|
|
|
|
.to receive(:new)
|
|
|
|
.with(project,
|
|
|
|
user,
|
|
|
|
{
|
|
|
|
before: oldrev,
|
|
|
|
after: newrev,
|
|
|
|
ref: ref,
|
|
|
|
checkout_sha: SeedRepo::Commit::ID,
|
2019-11-21 10:06:17 -05:00
|
|
|
variables_attributes: [],
|
2019-08-17 03:42:23 -04:00
|
|
|
push_options: {}
|
|
|
|
}).and_call_original
|
|
|
|
|
|
|
|
subject
|
|
|
|
end
|
|
|
|
|
2017-05-24 09:13:51 -04:00
|
|
|
it "creates a new pipeline" do
|
2017-08-09 05:52:22 -04:00
|
|
|
expect { subject }.to change { Ci::Pipeline.count }
|
2019-08-12 18:31:58 -04:00
|
|
|
|
|
|
|
pipeline = Ci::Pipeline.last
|
|
|
|
expect(pipeline).to be_push
|
|
|
|
expect(Gitlab::Git::BRANCH_REF_PREFIX + pipeline.ref).to eq(ref)
|
2017-05-24 09:13:51 -04:00
|
|
|
end
|
2019-09-04 02:34:52 -04:00
|
|
|
|
|
|
|
context 'when pipeline has errors' do
|
|
|
|
before do
|
|
|
|
config = YAML.dump({ test: { script: 'ls', only: ['feature'] } })
|
|
|
|
stub_ci_pipeline_yaml_file(config)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'reports an error' do
|
2019-12-22 04:07:51 -05:00
|
|
|
allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true)
|
2019-09-04 02:34:52 -04:00
|
|
|
expect(Sidekiq.logger).to receive(:warn)
|
|
|
|
|
|
|
|
expect { subject }.not_to change { Ci::Pipeline.count }
|
|
|
|
end
|
|
|
|
end
|
2017-05-24 09:13:51 -04:00
|
|
|
end
|
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
describe "Updates merge requests" do
|
|
|
|
it "when pushing a new branch for the first time" do
|
|
|
|
expect(UpdateMergeRequestsWorker)
|
|
|
|
.to receive(:perform_async)
|
|
|
|
.with(project.id, user.id, blankrev, 'newrev', ref)
|
2018-08-21 16:32:50 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: 'newrev', ref: ref)
|
2017-03-07 07:59:20 -05:00
|
|
|
end
|
2013-02-25 14:21:38 -05:00
|
|
|
end
|
|
|
|
|
2016-03-14 19:33:00 -04:00
|
|
|
describe "Updates git attributes" do
|
|
|
|
context "for default branch" do
|
|
|
|
it "calls the copy attributes method for the first push to the default branch" do
|
|
|
|
expect(project.repository).to receive(:copy_gitattributes).with('master')
|
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: 'newrev', ref: ref)
|
2016-03-14 19:33:00 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "calls the copy attributes method for changes to the default branch" do
|
2017-05-02 05:58:08 -04:00
|
|
|
expect(project.repository).to receive(:copy_gitattributes).with(ref)
|
2016-03-14 19:33:00 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: 'oldrev', newrev: 'newrev', ref: ref)
|
2016-03-14 19:33:00 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "for non-default branch" do
|
|
|
|
before do
|
|
|
|
# Make sure the "default" branch is different
|
|
|
|
allow(project).to receive(:default_branch).and_return('not-master')
|
|
|
|
end
|
|
|
|
|
|
|
|
it "does not call copy attributes method" do
|
|
|
|
expect(project.repository).not_to receive(:copy_gitattributes)
|
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-03-14 19:33:00 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-03-03 10:40:05 -05:00
|
|
|
|
2016-03-10 14:48:29 -05:00
|
|
|
describe "Webhooks" do
|
|
|
|
context "execute webhooks" do
|
2019-08-12 18:31:58 -04:00
|
|
|
before do
|
|
|
|
create(:project_hook, push_events: true, project: project)
|
|
|
|
end
|
|
|
|
|
2013-02-25 14:21:38 -05:00
|
|
|
it "when pushing a branch for the first time" do
|
2015-02-12 13:17:35 -05:00
|
|
|
expect(project).to receive(:execute_hooks)
|
|
|
|
expect(project.default_branch).to eq("master")
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: 'newrev', ref: ref)
|
2016-07-08 05:15:29 -04:00
|
|
|
expect(project.protected_branches).not_to be_empty
|
2018-07-11 10:36:08 -04:00
|
|
|
expect(project.protected_branches.first.push_access_levels.map(&:access_level)).to eq([Gitlab::Access::MAINTAINER])
|
|
|
|
expect(project.protected_branches.first.merge_access_levels.map(&:access_level)).to eq([Gitlab::Access::MAINTAINER])
|
2015-01-31 03:10:17 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it "when pushing a branch for the first time with default branch protection disabled" do
|
2015-07-01 17:21:51 -04:00
|
|
|
stub_application_setting(default_branch_protection: Gitlab::Access::PROTECTION_NONE)
|
2015-01-31 03:10:17 -05:00
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
expect(project).to receive(:execute_hooks)
|
|
|
|
expect(project.default_branch).to eq("master")
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: 'newrev', ref: ref)
|
2016-07-08 05:15:29 -04:00
|
|
|
expect(project.protected_branches).to be_empty
|
2015-01-31 03:10:17 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it "when pushing a branch for the first time with default branch protection set to 'developers can push'" do
|
2015-07-01 17:21:51 -04:00
|
|
|
stub_application_setting(default_branch_protection: Gitlab::Access::PROTECTION_DEV_CAN_PUSH)
|
2015-01-31 03:10:17 -05:00
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
expect(project).to receive(:execute_hooks)
|
|
|
|
expect(project.default_branch).to eq("master")
|
2016-07-18 04:16:56 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: 'newrev', ref: ref)
|
2016-07-08 05:15:29 -04:00
|
|
|
|
|
|
|
expect(project.protected_branches).not_to be_empty
|
2016-08-16 12:49:49 -04:00
|
|
|
expect(project.protected_branches.last.push_access_levels.map(&:access_level)).to eq([Gitlab::Access::DEVELOPER])
|
2018-07-11 10:36:08 -04:00
|
|
|
expect(project.protected_branches.last.merge_access_levels.map(&:access_level)).to eq([Gitlab::Access::MAINTAINER])
|
2016-07-18 04:16:56 -04:00
|
|
|
end
|
|
|
|
|
2016-09-17 23:33:41 -04:00
|
|
|
it "when pushing a branch for the first time with an existing branch permission configured" do
|
|
|
|
stub_application_setting(default_branch_protection: Gitlab::Access::PROTECTION_DEV_CAN_PUSH)
|
|
|
|
|
|
|
|
create(:protected_branch, :no_one_can_push, :developers_can_merge, project: project, name: 'master')
|
|
|
|
expect(project).to receive(:execute_hooks)
|
|
|
|
expect(project.default_branch).to eq("master")
|
2019-09-17 08:06:48 -04:00
|
|
|
expect(ProtectedBranches::CreateService).not_to receive(:new)
|
2016-09-17 23:33:41 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: 'newrev', ref: ref)
|
2016-09-17 23:33:41 -04:00
|
|
|
|
|
|
|
expect(project.protected_branches).not_to be_empty
|
|
|
|
expect(project.protected_branches.last.push_access_levels.map(&:access_level)).to eq([Gitlab::Access::NO_ACCESS])
|
|
|
|
expect(project.protected_branches.last.merge_access_levels.map(&:access_level)).to eq([Gitlab::Access::DEVELOPER])
|
|
|
|
end
|
|
|
|
|
2016-07-18 04:16:56 -04:00
|
|
|
it "when pushing a branch for the first time with default branch protection set to 'developers can merge'" do
|
|
|
|
stub_application_setting(default_branch_protection: Gitlab::Access::PROTECTION_DEV_CAN_MERGE)
|
|
|
|
|
|
|
|
expect(project).to receive(:execute_hooks)
|
|
|
|
expect(project.default_branch).to eq("master")
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: 'newrev', ref: ref)
|
2016-07-08 05:15:29 -04:00
|
|
|
expect(project.protected_branches).not_to be_empty
|
2018-07-11 10:36:08 -04:00
|
|
|
expect(project.protected_branches.first.push_access_levels.map(&:access_level)).to eq([Gitlab::Access::MAINTAINER])
|
2016-08-16 12:49:49 -04:00
|
|
|
expect(project.protected_branches.first.merge_access_levels.map(&:access_level)).to eq([Gitlab::Access::DEVELOPER])
|
2013-02-25 14:21:38 -05:00
|
|
|
end
|
|
|
|
|
2013-12-03 04:34:06 -05:00
|
|
|
it "when pushing new commits to existing branch" do
|
2015-02-12 13:17:35 -05:00
|
|
|
expect(project).to receive(:execute_hooks)
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: 'oldrev', newrev: 'newrev', ref: ref)
|
2013-12-03 04:34:06 -05:00
|
|
|
end
|
2013-02-25 14:21:38 -05:00
|
|
|
end
|
|
|
|
end
|
2013-05-30 19:16:49 -04:00
|
|
|
|
|
|
|
describe "cross-reference notes" do
|
|
|
|
let(:issue) { create :issue, project: project }
|
|
|
|
let(:commit_author) { create :user }
|
2015-04-21 09:13:40 -04:00
|
|
|
let(:commit) { project.commit }
|
2013-05-30 19:16:49 -04:00
|
|
|
|
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_developer(commit_author)
|
|
|
|
project.add_developer(user)
|
2016-03-17 16:39:50 -04:00
|
|
|
|
2015-05-21 17:49:06 -04:00
|
|
|
allow(commit).to receive_messages(
|
2015-10-13 05:37:42 -04:00
|
|
|
safe_message: "this commit \n mentions #{issue.to_reference}",
|
2013-05-30 19:16:49 -04:00
|
|
|
references: [issue],
|
|
|
|
author_name: commit_author.name,
|
|
|
|
author_email: commit_author.email
|
2015-05-21 17:49:06 -04:00
|
|
|
)
|
2016-03-17 16:39:50 -04:00
|
|
|
|
2017-06-21 09:48:12 -04:00
|
|
|
allow_any_instance_of(ProcessCommitWorker).to receive(:build_commit)
|
|
|
|
.and_return(commit)
|
2016-10-07 09:20:57 -04:00
|
|
|
|
2015-05-21 17:49:06 -04:00
|
|
|
allow(project.repository).to receive(:commits_between).and_return([commit])
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it "creates a note if a pushed commit mentions an issue", :sidekiq_might_not_need_inline do
|
2015-06-17 20:59:19 -04:00
|
|
|
expect(SystemNoteService).to receive(:cross_reference).with(issue, commit, commit_author)
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "only creates a cross-reference note if one doesn't already exist" do
|
2015-06-17 20:59:19 -04:00
|
|
|
SystemNoteService.cross_reference(issue, commit, user)
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2015-06-17 20:59:19 -04:00
|
|
|
expect(SystemNoteService).not_to receive(:cross_reference).with(issue, commit, commit_author)
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it "defaults to the pushing user if the commit's author is not known", :sidekiq_might_not_need_inline do
|
2015-05-21 17:49:06 -04:00
|
|
|
allow(commit).to receive_messages(
|
|
|
|
author_name: 'unknown name',
|
|
|
|
author_email: 'unknown@email.com'
|
|
|
|
)
|
2015-06-17 20:59:19 -04:00
|
|
|
expect(SystemNoteService).to receive(:cross_reference).with(issue, commit, user)
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it "finds references in the first push to a non-default branch", :sidekiq_might_not_need_inline do
|
2017-05-02 05:58:08 -04:00
|
|
|
allow(project.repository).to receive(:commits_between).with(blankrev, newrev).and_return([])
|
|
|
|
allow(project.repository).to receive(:commits_between).with("master", newrev).and_return([commit])
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2015-06-17 20:59:19 -04:00
|
|
|
expect(SystemNoteService).to receive(:cross_reference).with(issue, commit, commit_author)
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: newrev, ref: 'refs/heads/other')
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-09-19 03:26:25 -04:00
|
|
|
describe "issue metrics" do
|
|
|
|
let(:issue) { create :issue, project: project }
|
|
|
|
let(:commit_author) { create :user }
|
|
|
|
let(:commit) { project.commit }
|
|
|
|
let(:commit_time) { Time.now }
|
|
|
|
|
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_developer(commit_author)
|
|
|
|
project.add_developer(user)
|
2016-09-19 03:26:25 -04:00
|
|
|
|
|
|
|
allow(commit).to receive_messages(
|
|
|
|
safe_message: "this commit \n mentions #{issue.to_reference}",
|
|
|
|
references: [issue],
|
|
|
|
author_name: commit_author.name,
|
|
|
|
author_email: commit_author.email,
|
|
|
|
committed_date: commit_time
|
|
|
|
)
|
|
|
|
|
2017-06-21 09:48:12 -04:00
|
|
|
allow_any_instance_of(ProcessCommitWorker).to receive(:build_commit)
|
|
|
|
.and_return(commit)
|
2016-10-07 09:20:57 -04:00
|
|
|
|
2016-09-19 03:26:25 -04:00
|
|
|
allow(project.repository).to receive(:commits_between).and_return([commit])
|
|
|
|
end
|
|
|
|
|
|
|
|
context "while saving the 'first_mentioned_in_commit_at' metric for an issue" do
|
2019-10-23 05:06:03 -04:00
|
|
|
it 'sets the metric for referenced issues', :sidekiq_might_not_need_inline do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-09-19 03:26:25 -04:00
|
|
|
|
2016-10-17 08:40:02 -04:00
|
|
|
expect(issue.reload.metrics.first_mentioned_in_commit_at).to be_like_time(commit_time)
|
2016-09-19 03:26:25 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not set the metric for non-referenced issues' do
|
|
|
|
non_referenced_issue = create(:issue, project: project)
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-09-19 03:26:25 -04:00
|
|
|
|
2016-09-20 17:21:43 -04:00
|
|
|
expect(non_referenced_issue.reload.metrics.first_mentioned_in_commit_at).to be_nil
|
2016-09-19 03:26:25 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-08-21 09:05:43 -04:00
|
|
|
describe "closing issues from pushed commits containing a closing reference" do
|
2013-05-30 19:16:49 -04:00
|
|
|
let(:issue) { create :issue, project: project }
|
|
|
|
let(:other_issue) { create :issue, project: project }
|
|
|
|
let(:commit_author) { create :user }
|
2015-04-21 09:13:40 -04:00
|
|
|
let(:closing_commit) { project.commit }
|
2013-05-30 19:16:49 -04:00
|
|
|
|
|
|
|
before do
|
2015-05-21 17:49:06 -04:00
|
|
|
allow(closing_commit).to receive_messages(
|
2013-05-30 19:16:49 -04:00
|
|
|
issue_closing_regex: /^([Cc]loses|[Ff]ixes) #\d+/,
|
|
|
|
safe_message: "this is some work.\n\ncloses ##{issue.iid}",
|
|
|
|
author_name: commit_author.name,
|
|
|
|
author_email: commit_author.email
|
2015-05-21 17:49:06 -04:00
|
|
|
)
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2017-06-21 09:48:12 -04:00
|
|
|
allow(project.repository).to receive(:commits_between)
|
|
|
|
.and_return([closing_commit])
|
2016-03-09 07:49:05 -05:00
|
|
|
|
2017-06-21 09:48:12 -04:00
|
|
|
allow_any_instance_of(ProcessCommitWorker).to receive(:build_commit)
|
|
|
|
.and_return(closing_commit)
|
2016-10-07 09:20:57 -04:00
|
|
|
|
2018-07-11 10:36:08 -04:00
|
|
|
project.add_maintainer(commit_author)
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
|
2015-08-21 09:05:43 -04:00
|
|
|
context "to default branches" do
|
2019-10-23 05:06:03 -04:00
|
|
|
it "closes issues", :sidekiq_might_not_need_inline do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2015-08-21 09:05:43 -04:00
|
|
|
expect(Issue.find(issue.id)).to be_closed
|
|
|
|
end
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it "adds a note indicating that the issue is now closed", :sidekiq_might_not_need_inline do
|
2015-08-21 09:05:43 -04:00
|
|
|
expect(SystemNoteService).to receive(:change_status).with(issue, project, commit_author, "closed", closing_commit)
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2015-08-21 09:05:43 -04:00
|
|
|
end
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2015-08-21 09:05:43 -04:00
|
|
|
it "doesn't create additional cross-reference notes" do
|
|
|
|
expect(SystemNoteService).not_to receive(:cross_reference)
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2015-08-21 09:05:43 -04:00
|
|
|
end
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
2015-06-12 01:39:50 -04:00
|
|
|
|
2015-08-21 09:05:43 -04:00
|
|
|
context "to non-default branches" do
|
|
|
|
before do
|
|
|
|
# Make sure the "default" branch is different
|
|
|
|
allow(project).to receive(:default_branch).and_return('not-master')
|
|
|
|
end
|
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it "creates cross-reference notes", :sidekiq_might_not_need_inline do
|
2015-08-21 09:05:43 -04:00
|
|
|
expect(SystemNoteService).to receive(:cross_reference).with(issue, closing_commit, commit_author)
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2015-08-21 09:05:43 -04:00
|
|
|
end
|
2015-06-12 01:39:50 -04:00
|
|
|
|
2015-08-21 09:05:43 -04:00
|
|
|
it "doesn't close issues" do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2015-08-21 09:05:43 -04:00
|
|
|
expect(Issue.find(issue.id)).to be_opened
|
|
|
|
end
|
2015-06-12 01:39:50 -04:00
|
|
|
end
|
2015-12-17 17:08:14 -05:00
|
|
|
|
|
|
|
context "for jira issue tracker" do
|
|
|
|
include JiraServiceHelper
|
|
|
|
|
|
|
|
let(:jira_tracker) { project.create_jira_service if project.jira_service.nil? }
|
|
|
|
|
|
|
|
before do
|
2016-10-06 17:17:11 -04:00
|
|
|
# project.create_jira_service doesn't seem to invalidate the cache here
|
|
|
|
project.has_external_issue_tracker = true
|
2015-12-17 17:08:14 -05:00
|
|
|
jira_service_settings
|
2016-09-29 17:11:32 -04:00
|
|
|
stub_jira_urls("JIRA-1")
|
2015-12-17 17:08:14 -05:00
|
|
|
|
|
|
|
allow(closing_commit).to receive_messages({
|
2017-05-02 05:58:08 -04:00
|
|
|
issue_closing_regex: Regexp.new(Gitlab.config.gitlab.issue_closing_pattern),
|
|
|
|
safe_message: message,
|
|
|
|
author_name: commit_author.name,
|
|
|
|
author_email: commit_author.email
|
|
|
|
})
|
|
|
|
|
2017-05-18 02:07:48 -04:00
|
|
|
allow(JIRA::Resource::Remotelink).to receive(:all).and_return([])
|
2015-12-17 17:08:14 -05:00
|
|
|
|
|
|
|
allow(project.repository).to receive_messages(commits_between: [closing_commit])
|
|
|
|
end
|
|
|
|
|
|
|
|
after do
|
|
|
|
jira_tracker.destroy!
|
|
|
|
end
|
|
|
|
|
|
|
|
context "mentioning an issue" do
|
|
|
|
let(:message) { "this is some work.\n\nrelated to JIRA-1" }
|
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it "initiates one api call to jira server to mention the issue", :sidekiq_might_not_need_inline do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2015-12-17 17:08:14 -05:00
|
|
|
|
2016-09-29 17:11:32 -04:00
|
|
|
expect(WebMock).to have_requested(:post, jira_api_comment_url('JIRA-1')).with(
|
2015-12-17 17:08:14 -05:00
|
|
|
body: /mentioned this issue in/
|
|
|
|
).once
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "closing an issue" do
|
2019-01-16 07:09:29 -05:00
|
|
|
let(:message) { "this is some work.\n\ncloses JIRA-1" }
|
2017-05-02 05:58:08 -04:00
|
|
|
let(:comment_body) do
|
|
|
|
{
|
2017-07-20 05:34:09 -04:00
|
|
|
body: "Issue solved with [#{closing_commit.id}|http://#{Gitlab.config.gitlab.host}/#{project.full_path}/commit/#{closing_commit.id}]."
|
2017-05-02 05:58:08 -04:00
|
|
|
}.to_json
|
|
|
|
end
|
2016-10-06 18:05:27 -04:00
|
|
|
|
2016-11-09 16:55:21 -05:00
|
|
|
before do
|
|
|
|
open_issue = JIRA::Resource::Issue.new(jira_tracker.client, attrs: { "id" => "JIRA-1" })
|
|
|
|
closed_issue = open_issue.dup
|
|
|
|
allow(open_issue).to receive(:resolution).and_return(false)
|
|
|
|
allow(closed_issue).to receive(:resolution).and_return(true)
|
|
|
|
allow(JIRA::Resource::Issue).to receive(:find).and_return(open_issue, closed_issue)
|
|
|
|
|
|
|
|
allow_any_instance_of(JIRA::Resource::Issue).to receive(:key).and_return("JIRA-1")
|
|
|
|
end
|
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
context "using right markdown", :sidekiq_might_not_need_inline do
|
2016-10-06 18:05:27 -04:00
|
|
|
it "initiates one api call to jira server to close the issue" do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-10-06 18:05:27 -04:00
|
|
|
|
2016-09-29 17:11:32 -04:00
|
|
|
expect(WebMock).to have_requested(:post, jira_api_transition_url('JIRA-1')).once
|
2016-10-06 18:05:27 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "initiates one api call to jira server to comment on the issue" do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-10-06 18:05:27 -04:00
|
|
|
|
2016-09-29 17:11:32 -04:00
|
|
|
expect(WebMock).to have_requested(:post, jira_api_comment_url('JIRA-1')).with(
|
2016-10-06 18:05:27 -04:00
|
|
|
body: comment_body
|
|
|
|
).once
|
|
|
|
end
|
2015-12-17 17:08:14 -05:00
|
|
|
end
|
|
|
|
|
2017-07-10 03:38:42 -04:00
|
|
|
context "using internal issue reference" do
|
|
|
|
context 'when internal issues are disabled' do
|
|
|
|
before do
|
|
|
|
project.issues_enabled = false
|
|
|
|
project.save!
|
|
|
|
end
|
|
|
|
let(:message) { "this is some work.\n\ncloses #1" }
|
|
|
|
|
|
|
|
it "does not initiates one api call to jira server to close the issue" do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2017-07-10 03:38:42 -04:00
|
|
|
|
|
|
|
expect(WebMock).not_to have_requested(:post, jira_api_transition_url('JIRA-1'))
|
|
|
|
end
|
|
|
|
|
|
|
|
it "does not initiates one api call to jira server to comment on the issue" do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2017-07-10 03:38:42 -04:00
|
|
|
|
|
|
|
expect(WebMock).not_to have_requested(:post, jira_api_comment_url('JIRA-1')).with(
|
|
|
|
body: comment_body
|
|
|
|
).once
|
|
|
|
end
|
|
|
|
end
|
2015-12-17 17:08:14 -05:00
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
context 'when internal issues are enabled', :sidekiq_might_not_need_inline do
|
2017-07-10 03:38:42 -04:00
|
|
|
let(:issue) { create(:issue, project: project) }
|
|
|
|
let(:message) { "this is some work.\n\ncloses JIRA-1 \n\n closes #{issue.to_reference}" }
|
2016-10-06 18:05:27 -04:00
|
|
|
|
2017-07-10 03:38:42 -04:00
|
|
|
it "initiates one api call to jira server to close the jira issue" do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-10-06 18:05:27 -04:00
|
|
|
|
2017-07-10 03:38:42 -04:00
|
|
|
expect(WebMock).to have_requested(:post, jira_api_transition_url('JIRA-1')).once
|
|
|
|
end
|
2016-10-06 18:05:27 -04:00
|
|
|
|
2017-07-10 03:38:42 -04:00
|
|
|
it "initiates one api call to jira server to comment on the jira issue" do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2017-07-10 03:38:42 -04:00
|
|
|
|
|
|
|
expect(WebMock).to have_requested(:post, jira_api_comment_url('JIRA-1')).with(
|
|
|
|
body: comment_body
|
|
|
|
).once
|
|
|
|
end
|
|
|
|
|
|
|
|
it "closes the internal issue" do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2017-07-10 03:38:42 -04:00
|
|
|
expect(issue.reload).to be_closed
|
|
|
|
end
|
|
|
|
|
|
|
|
it "adds a note indicating that the issue is now closed" do
|
|
|
|
expect(SystemNoteService).to receive(:change_status)
|
|
|
|
.with(issue, project, commit_author, "closed", closing_commit)
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, commit_author, oldrev: oldrev, newrev: newrev, ref: ref)
|
2017-07-10 03:38:42 -04:00
|
|
|
end
|
2016-10-06 18:05:27 -04:00
|
|
|
end
|
2015-12-17 17:08:14 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
2013-02-25 14:21:38 -05:00
|
|
|
|
2015-05-06 02:49:30 -04:00
|
|
|
describe "empty project" do
|
|
|
|
let(:project) { create(:project_empty_repo) }
|
2017-05-02 05:58:08 -04:00
|
|
|
let(:new_ref) { 'refs/heads/feature' }
|
2015-05-06 02:49:30 -04:00
|
|
|
|
|
|
|
before do
|
|
|
|
allow(project).to receive(:default_branch).and_return('feature')
|
|
|
|
expect(project).to receive(:change_head) { 'feature'}
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'push to first branch updates HEAD' do
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: blankrev, newrev: newrev, ref: new_ref)
|
2015-05-06 02:49:30 -04:00
|
|
|
end
|
|
|
|
end
|
2016-02-17 04:42:59 -05:00
|
|
|
|
2016-03-14 11:49:24 -04:00
|
|
|
describe "housekeeping" do
|
2016-03-15 06:03:43 -04:00
|
|
|
let(:housekeeping) { Projects::HousekeepingService.new(project) }
|
2016-03-14 11:49:24 -04:00
|
|
|
|
|
|
|
before do
|
2017-07-10 23:35:47 -04:00
|
|
|
# Flush any raw key-value data stored by the housekeeping code.
|
|
|
|
Gitlab::Redis::Cache.with { |conn| conn.flushall }
|
|
|
|
Gitlab::Redis::Queues.with { |conn| conn.flushall }
|
|
|
|
Gitlab::Redis::SharedState.with { |conn| conn.flushall }
|
2016-10-11 11:31:19 -04:00
|
|
|
|
2016-03-14 11:49:24 -04:00
|
|
|
allow(Projects::HousekeepingService).to receive(:new).and_return(housekeeping)
|
|
|
|
end
|
|
|
|
|
2016-10-11 11:31:19 -04:00
|
|
|
after do
|
2017-07-10 23:35:47 -04:00
|
|
|
Gitlab::Redis::Cache.with { |conn| conn.flushall }
|
|
|
|
Gitlab::Redis::Queues.with { |conn| conn.flushall }
|
|
|
|
Gitlab::Redis::SharedState.with { |conn| conn.flushall }
|
2016-10-11 11:31:19 -04:00
|
|
|
end
|
|
|
|
|
2016-03-14 11:49:24 -04:00
|
|
|
it 'does not perform housekeeping when not needed' do
|
|
|
|
expect(housekeeping).not_to receive(:execute)
|
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-03-14 11:49:24 -04:00
|
|
|
end
|
|
|
|
|
2016-03-15 06:03:43 -04:00
|
|
|
context 'when housekeeping is needed' do
|
|
|
|
before do
|
|
|
|
allow(housekeeping).to receive(:needed?).and_return(true)
|
|
|
|
end
|
2016-03-14 11:49:24 -04:00
|
|
|
|
2016-03-15 06:03:43 -04:00
|
|
|
it 'performs housekeeping' do
|
|
|
|
expect(housekeeping).to receive(:execute)
|
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-03-15 06:03:43 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not raise an exception' do
|
|
|
|
allow(housekeeping).to receive(:try_obtain_lease).and_return(false)
|
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-03-15 06:03:43 -04:00
|
|
|
end
|
2016-03-14 11:49:24 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'increments the push counter' do
|
|
|
|
expect(housekeeping).to receive(:increment!)
|
2016-03-15 06:03:43 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-03-14 11:49:24 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
describe "CI environments" do
|
|
|
|
context 'create branch' do
|
|
|
|
let(:oldrev) { blankrev }
|
2016-11-18 08:04:18 -05:00
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
it 'does nothing' do
|
|
|
|
expect(::Ci::StopEnvironmentsService).not_to receive(:new)
|
2016-11-18 08:04:18 -05:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-11-18 08:04:18 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
context 'update branch' do
|
|
|
|
it 'does nothing' do
|
|
|
|
expect(::Ci::StopEnvironmentsService).not_to receive(:new)
|
2016-11-18 08:04:18 -05:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2016-11-18 08:04:18 -05:00
|
|
|
end
|
|
|
|
end
|
2016-12-21 10:26:35 -05:00
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
context 'delete branch' do
|
|
|
|
let(:newrev) { blankrev }
|
2017-07-10 07:19:50 -04:00
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
it 'stops environments' do
|
|
|
|
expect_next_instance_of(::Ci::StopEnvironmentsService) do |stop_service|
|
|
|
|
expect(stop_service.project).to eq(project)
|
|
|
|
expect(stop_service.current_user).to eq(user)
|
|
|
|
expect(stop_service).to receive(:execute).with(branch)
|
2017-08-15 07:22:55 -04:00
|
|
|
end
|
2017-07-10 07:19:50 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2017-08-15 07:22:55 -04:00
|
|
|
end
|
2019-03-28 10:59:24 -04:00
|
|
|
end
|
|
|
|
end
|
2017-08-15 07:22:55 -04:00
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
describe 'Hooks' do
|
|
|
|
context 'run on a branch' do
|
|
|
|
it 'delegates to Git::BranchHooksService' do
|
|
|
|
expect_next_instance_of(::Git::BranchHooksService) do |hooks_service|
|
|
|
|
expect(hooks_service.project).to eq(project)
|
|
|
|
expect(hooks_service.current_user).to eq(user)
|
|
|
|
expect(hooks_service.params).to include(
|
2019-10-03 11:07:07 -04:00
|
|
|
change: {
|
|
|
|
oldrev: oldrev,
|
|
|
|
newrev: newrev,
|
|
|
|
ref: ref
|
|
|
|
}
|
2019-03-28 10:59:24 -04:00
|
|
|
)
|
2018-07-30 12:55:28 -04:00
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
expect(hooks_service).to receive(:execute)
|
2018-07-30 12:55:28 -04:00
|
|
|
end
|
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2017-08-15 07:22:55 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
context 'run on a tag' do
|
|
|
|
let(:ref) { 'refs/tags/v1.1.0' }
|
2017-08-15 07:22:55 -04:00
|
|
|
|
2019-03-28 10:59:24 -04:00
|
|
|
it 'does nothing' do
|
|
|
|
expect(::Git::BranchHooksService).not_to receive(:new)
|
2017-08-15 07:22:55 -04:00
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
execute_service(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
|
2017-08-15 07:22:55 -04:00
|
|
|
end
|
2017-07-10 07:19:50 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-10-03 11:07:07 -04:00
|
|
|
def execute_service(project, user, change)
|
|
|
|
service = described_class.new(project, user, change: change)
|
2016-02-17 04:42:59 -05:00
|
|
|
service.execute
|
|
|
|
service
|
|
|
|
end
|
2015-10-14 01:07:58 -04:00
|
|
|
end
|