summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-07-03 22:13:10 +0900
committerShinya Maeda <shinya@gitlab.com>2017-07-05 18:38:35 +0900
commit3acc91866bec2004f4dae542dae0d66a2921b4da (patch)
tree198858a7e791652573ecf87072040a1e1972923a /spec
parent621f9307ff261f00c67b04210210a14cd7aac081 (diff)
downloadgitlab-ce-3acc91866bec2004f4dae542dae0d66a2921b4da.tar.gz
Fix spec
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/import_export/all_models.yml2
-rw-r--r--spec/models/ci/build_spec.rb1
-rw-r--r--spec/models/ci/pipeline_schedule_spec.rb4
3 files changed, 6 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 517dcf6cd61..0b2e2b335c4 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -130,9 +130,9 @@ pipeline_schedules:
- owner
- pipelines
- last_pipeline
+- variables
pipeline_schedule:
- pipelines
-- variables
pipeline_schedule_variables:
- pipeline_schedule
deploy_keys:
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index a4f29ce462f..cb1a4cee467 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1379,6 +1379,7 @@ describe Ci::Build, :models do
end
before do
+ pipeline_schedule.reload
pipeline_schedule.pipelines << pipeline
end
diff --git a/spec/models/ci/pipeline_schedule_spec.rb b/spec/models/ci/pipeline_schedule_spec.rb
index 2f826a91417..34722ef1a69 100644
--- a/spec/models/ci/pipeline_schedule_spec.rb
+++ b/spec/models/ci/pipeline_schedule_spec.rb
@@ -127,6 +127,10 @@ describe Ci::PipelineSchedule, models: true do
subject { pipeline_schedule.job_variables }
+ before do
+ pipeline_schedule.reload
+ end
+
it { is_expected.to eq(pipeline_schedule_variables.map(&:to_runner_variable)) }
end
end