kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix the conflict resolution in spec/models/ci/runner_spec.rb

Browse source
This commit is contained in:
Dylan Griffith 2018-05-24 12:43:48 +02:00
parent 85949ac151
commit ec614728f6
1 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
spec/models/ci/runner_spec.rb
View file

@ -612,36 +612,20 @@ describe Ci::Runner do
end
describe '.assignable_for' do
let(:runner) { create(:ci_runner, :project, projects: [project]) }
let(:project) { create(:project) }
let(:group) { create(:group) }
let(:another_project) { create(:project) }
let!(:unlocked_project_runner) { create(:ci_runner, :project, projects: [project]) }
let!(:locked_project_runner) { create(:ci_runner, :project, locked: true, projects: [project]) }
let!(:group_runner) { create(:ci_runner, :group, groups: [group]) }
let!(:instance_runner) { create(:ci_runner, :instance) }
context 'with shared runners' do
let(:runner) { create(:ci_runner, :instance) }
context 'does not give owned runner' do
context 'with already assigned project' do
subject { described_class.assignable_for(project) }
it { is_expected.to be_empty }
end
context 'does not give shared runner' do
subject { described_class.assignable_for(another_project) }
it { is_expected.to be_empty }
end
end
context 'with unlocked runner' do
context 'does not give owned runner' do
subject { described_class.assignable_for(project) }
it { is_expected.to be_empty }
end
it { is_expected.to be_empty }
end
context 'with a different project' do
subject { described_class.assignable_for(another_project) }