From e1285c1d8ad2c7a5ed556bd5296fbe4afcacb16d Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 25 Nov 2016 15:11:56 +0100 Subject: Restore method that ensures builds being created --- spec/factories/ci/pipelines.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'spec/factories/ci') diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb index ac2a1ba5dff..3c35dae8772 100644 --- a/spec/factories/ci/pipelines.rb +++ b/spec/factories/ci/pipelines.rb @@ -29,5 +29,16 @@ FactoryGirl.define do allow(commit).to receive(:ci_yaml_file) { File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) } end end + + factory(:ci_pipeline_with_yaml) do + transient { yaml nil } + + after(:build) do |pipeline, evaluator| + raise ArgumentError unless evaluator.yaml + + allow(pipeline).to receive(:ci_yaml_file) + .and_return(YAML.dump(evaluator.yaml)) + end + end end end -- cgit v1.2.3 From d766ab9f9a72a2919fb20c27fdf7b74e88042340 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 25 Nov 2016 15:13:15 +0100 Subject: Remove pipeline factory that is not used in tests --- spec/factories/ci/pipelines.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'spec/factories/ci') diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb index 3c35dae8772..4fd29806590 100644 --- a/spec/factories/ci/pipelines.rb +++ b/spec/factories/ci/pipelines.rb @@ -18,12 +18,6 @@ FactoryGirl.define do end end - factory :ci_pipeline_with_two_job do - after(:build) do |commit| - allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" }, spinach: { script: "ls" } }) } - end - end - factory :ci_pipeline do after(:build) do |commit| allow(commit).to receive(:ci_yaml_file) { File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) } -- cgit v1.2.3 From 86e7f22b6d10b9113c52f79685edb332d202f567 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 25 Nov 2016 15:15:31 +0100 Subject: Improve readability in pipeline test objects factory --- spec/factories/ci/pipelines.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'spec/factories/ci') diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb index 4fd29806590..23585db6ebd 100644 --- a/spec/factories/ci/pipelines.rb +++ b/spec/factories/ci/pipelines.rb @@ -7,20 +7,24 @@ FactoryGirl.define do project factory: :empty_project factory :ci_pipeline_without_jobs do - after(:build) do |commit| - allow(commit).to receive(:ci_yaml_file) { YAML.dump({}) } + after(:build) do |pipeline| + allow(pipeline).to receive(:ci_yaml_file) { YAML.dump({}) } end end factory :ci_pipeline_with_one_job do - after(:build) do |commit| - allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" } }) } + after(:build) do |pipeline| + allow(pipeline).to receive(:ci_yaml_file) do + YAML.dump({ rspec: { script: "ls" } }) + end end end factory :ci_pipeline do - after(:build) do |commit| - allow(commit).to receive(:ci_yaml_file) { File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) } + after(:build) do |pipeline| + allow(pipeline).to receive(:ci_yaml_file) do + File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) + end end end -- cgit v1.2.3 From 3761a0c50ea13b86152417a5e659b30879cb16b1 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Sun, 27 Nov 2016 16:24:43 +0100 Subject: Extend pipelines factory with transient config attribute --- spec/factories/ci/pipelines.rb | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'spec/factories/ci') diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb index 23585db6ebd..1735791f644 100644 --- a/spec/factories/ci/pipelines.rb +++ b/spec/factories/ci/pipelines.rb @@ -21,21 +21,16 @@ FactoryGirl.define do end factory :ci_pipeline do - after(:build) do |pipeline| - allow(pipeline).to receive(:ci_yaml_file) do - File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) - end - end - end - - factory(:ci_pipeline_with_yaml) do - transient { yaml nil } + transient { config nil } after(:build) do |pipeline, evaluator| - raise ArgumentError unless evaluator.yaml - - allow(pipeline).to receive(:ci_yaml_file) - .and_return(YAML.dump(evaluator.yaml)) + allow(pipeline).to receive(:ci_yaml_file) do + if evaluator.config + YAML.dump(evaluator.config) + else + File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) + end + end end end end -- cgit v1.2.3