From 4a431a266f8773c54a0f47292d4b9470a7d2acd3 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 29 Jul 2016 20:20:04 +0800
Subject: [PATCH] Fix that tricky side-effect issue in the test
---
app/models/ci/build.rb | 2 +-
spec/models/build_spec.rb | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index aac78d75f57..e5523c42a3b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -460,7 +460,7 @@ module Ci
def build_attributes_from_config
return {} unless pipeline.config_processor
-
+
pipeline.config_processor.build_attributes(name)
end
end
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index dc88697199b..47c489e6af1 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -275,7 +275,8 @@ describe Ci::Build, models: true do
context 'when yaml_variables are undefined' do
before do
- build.yaml_variables = nil
+ build.update(yaml_variables: nil)
+ build.reload # reload pipeline so that it resets config_processor
end
context 'use from gitlab-ci.yml' do
@@ -854,7 +855,8 @@ describe Ci::Build, models: true do
context 'if is undefined' do
before do
- build.when = nil
+ build.update(when: nil)
+ build.reload # reload pipeline so that it resets config_processor
end
context 'use from gitlab-ci.yml' do
--
2.30.9