Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-07 21:08:32 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-07 21:08:32 +0300
commitdff0f3475c8dc49daccb1f9fd2399b881e6cc1f0 (patch)
treef61feff669dfa72bb8f03e8c3d0d38df45be5263 /spec/services/ci/register_job_service_spec.rb
parentcf24d183b3f71f091a02f12b211f3001be5b5085 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/ci/register_job_service_spec.rb')
-rw-r--r--spec/services/ci/register_job_service_spec.rb28
1 files changed, 14 insertions, 14 deletions
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 921f5ba4c7e..0cdc8d2c870 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -15,14 +15,14 @@ module Ci
describe '#execute' do
context 'runner follow tag list' do
it "picks build with the same tag" do
- pending_job.update(tag_list: ["linux"])
- specific_runner.update(tag_list: ["linux"])
+ pending_job.update!(tag_list: ["linux"])
+ specific_runner.update!(tag_list: ["linux"])
expect(execute(specific_runner)).to eq(pending_job)
end
it "does not pick build with different tag" do
- pending_job.update(tag_list: ["linux"])
- specific_runner.update(tag_list: ["win32"])
+ pending_job.update!(tag_list: ["linux"])
+ specific_runner.update!(tag_list: ["win32"])
expect(execute(specific_runner)).to be_falsey
end
@@ -31,24 +31,24 @@ module Ci
end
it "does not pick build with tag" do
- pending_job.update(tag_list: ["linux"])
+ pending_job.update!(tag_list: ["linux"])
expect(execute(specific_runner)).to be_falsey
end
it "pick build without tag" do
- specific_runner.update(tag_list: ["win32"])
+ specific_runner.update!(tag_list: ["win32"])
expect(execute(specific_runner)).to eq(pending_job)
end
end
context 'deleted projects' do
before do
- project.update(pending_delete: true)
+ project.update!(pending_delete: true)
end
context 'for shared runners' do
before do
- project.update(shared_runners_enabled: true)
+ project.update!(shared_runners_enabled: true)
end
it 'does not pick a build' do
@@ -65,7 +65,7 @@ module Ci
context 'allow shared runners' do
before do
- project.update(shared_runners_enabled: true)
+ project.update!(shared_runners_enabled: true)
end
context 'for multiple builds' do
@@ -131,7 +131,7 @@ module Ci
context 'disallow shared runners' do
before do
- project.update(shared_runners_enabled: false)
+ project.update!(shared_runners_enabled: false)
end
context 'shared runner' do
@@ -152,7 +152,7 @@ module Ci
context 'disallow when builds are disabled' do
before do
- project.update(shared_runners_enabled: true, group_runners_enabled: true)
+ project.update!(shared_runners_enabled: true, group_runners_enabled: true)
project.project_feature.update_attribute(:builds_access_level, ProjectFeature::DISABLED)
end
@@ -591,8 +591,8 @@ module Ci
.with(:job_queue_duration_seconds, anything, anything, anything)
.and_return(job_queue_duration_seconds)
- project.update(shared_runners_enabled: true)
- pending_job.update(created_at: current_time - 3600, queued_at: current_time - 1800)
+ project.update!(shared_runners_enabled: true)
+ pending_job.update!(created_at: current_time - 3600, queued_at: current_time - 1800)
end
shared_examples 'attempt counter collector' do
@@ -661,7 +661,7 @@ module Ci
context 'when pending job with queued_at=nil is used' do
before do
- pending_job.update(queued_at: nil)
+ pending_job.update!(queued_at: nil)
end
it_behaves_like 'attempt counter collector'