diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 16:22:26 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 16:22:26 +0200 |
commit | 20c7144ed20bad499b878425d5fbab408ad066b5 (patch) | |
tree | 8b25261fa12fc36abca7639664329724d2a4302d /spec/factories | |
parent | 8ce1896b46f893de62528e44172be8c128b27c9b (diff) | |
download | gitlab-ce-20c7144ed20bad499b878425d5fbab408ad066b5.tar.gz |
Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/ci/builds.rb | 2 | ||||
-rw-r--r-- | spec/factories/ci/commits.rb | 10 | ||||
-rw-r--r-- | spec/factories/commit_statuses.rb | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index 903e331296a..fe05a0cfc00 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -16,7 +16,7 @@ FactoryGirl.define do } end - pipeline factory: :ci_commit + pipeline factory: :ci_pipeline trait :success do status 'success' diff --git a/spec/factories/ci/commits.rb b/spec/factories/ci/commits.rb index d1082f01326..a039bef6f3c 100644 --- a/spec/factories/ci/commits.rb +++ b/spec/factories/ci/commits.rb @@ -17,30 +17,30 @@ # FactoryGirl.define do - factory :ci_empty_commit, class: Ci::Pipeline do + factory :ci_empty_pipeline, class: Ci::Pipeline do sha '97de212e80737a608d939f648d959671fb0a0142' project factory: :empty_project - factory :ci_commit_without_jobs do + factory :ci_pipeline_without_jobs do after(:build) do |commit| allow(commit).to receive(:ci_yaml_file) { YAML.dump({}) } end end - factory :ci_commit_with_one_job do + factory :ci_pipeline_with_one_job do after(:build) do |commit| allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" } }) } end end - factory :ci_commit_with_two_jobs do + 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_commit do + 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')) } end diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb index 65afcc5e50d..1e5c479616c 100644 --- a/spec/factories/commit_statuses.rb +++ b/spec/factories/commit_statuses.rb @@ -3,7 +3,7 @@ FactoryGirl.define do name 'default' status 'success' description 'commit status' - pipeline factory: :ci_commit_with_one_job + pipeline factory: :ci_pipeline_with_one_job started_at 'Tue, 26 Jan 2016 08:21:42 +0100' finished_at 'Tue, 26 Jan 2016 08:23:42 +0100' |