summaryrefslogtreecommitdiff
path: root/spec/models/project_spec.rb
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2018-05-23 13:23:49 +0200
committerDylan Griffith <dyl.griffith@gmail.com>2018-05-31 10:56:07 +0200
commit051f385e7e82130e6978cd3956e5c48fbdc83b2e (patch)
tree14284bade4be86bb80984127be91c30ada3de633 /spec/models/project_spec.rb
parent5c34c3fcd5f100b401b59d5a0f8e4fa0c899c8f5 (diff)
downloadgitlab-ce-051f385e7e82130e6978cd3956e5c48fbdc83b2e.tar.gz
Refactor validations and make runner factory by default to be instance-wide runner
Diffstat (limited to 'spec/models/project_spec.rb')
-rw-r--r--spec/models/project_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index be471f198ff..9a76452a808 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1177,8 +1177,8 @@ describe Project do
describe '#any_runners?' do
context 'shared runners' do
let(:project) { create(:project, shared_runners_enabled: shared_runners_enabled) }
- let(:specific_runner) { create(:ci_runner) }
- let(:shared_runner) { create(:ci_runner, :shared) }
+ let(:specific_runner) { create(:ci_runner, :project, projects: [project]) }
+ let(:shared_runner) { create(:ci_runner, :instance) }
context 'for shared runners disabled' do
let(:shared_runners_enabled) { false }
@@ -1188,7 +1188,7 @@ describe Project do
end
it 'has a specific runner' do
- project.runners << specific_runner
+ specific_runner
expect(project.any_runners?).to be_truthy
end
@@ -1200,13 +1200,13 @@ describe Project do
end
it 'checks the presence of specific runner' do
- project.runners << specific_runner
+ specific_runner
expect(project.any_runners? { |runner| runner == specific_runner }).to be_truthy
end
it 'returns false if match cannot be found' do
- project.runners << specific_runner
+ specific_runner
expect(project.any_runners? { false }).to be_falsey
end