diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-07 13:14:37 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-07 13:14:37 +0200 |
commit | 8988c8743d2f74b7939a39fbd1c6ebcaa5ac6647 (patch) | |
tree | f7d98851567f2a156d0aa8cff158d57e1fba0a64 /spec | |
parent | 6e64d1ac7631675008832111f3759c007bda4504 (diff) | |
download | gitlab-ce-8988c8743d2f74b7939a39fbd1c6ebcaa5ac6647.tar.gz |
Fix remaining test offensesrename-ci-commit-phase-2
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/project_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/create_commit_builds_service_spec.rb | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 3431d0435b4..553556ed326 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -408,7 +408,7 @@ describe Project, models: true do it { is_expected.to eq(pipeline) } context 'return latest' do - let(:pipeline2) { create :pipeline, project: project, ref: 'master' } + let(:pipeline2) { create :ci_pipeline, project: project, ref: 'master' } before do pipeline diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb index 77247a1d5a5..a5b4d9f05de 100644 --- a/spec/services/create_commit_builds_service_spec.rb +++ b/spec/services/create_commit_builds_service_spec.rb @@ -74,7 +74,7 @@ describe CreateCommitBuildsService, services: true do before: '00000000', after: '31das312', commits: commits - ) + ) expect(pipeline).to be_persisted expect(pipeline.builds.any?).to be false expect(pipeline.status).to eq('failed') @@ -95,7 +95,7 @@ describe CreateCommitBuildsService, services: true do before: '00000000', after: '31das312', commits: commits - ) + ) expect(pipeline).to be_persisted expect(pipeline.builds.any?).to be false expect(pipeline.status).to eq("skipped") @@ -110,7 +110,7 @@ describe CreateCommitBuildsService, services: true do before: '00000000', after: '31das312', commits: commits - ) + ) expect(pipeline).to be_persisted expect(pipeline.builds.first.name).to eq("staging") @@ -124,7 +124,7 @@ describe CreateCommitBuildsService, services: true do before: '00000000', after: '31das312', commits: commits - ) + ) expect(pipeline).to be_persisted expect(pipeline.builds.any?).to be false expect(pipeline.status).to eq("skipped") @@ -141,7 +141,7 @@ describe CreateCommitBuildsService, services: true do before: '00000000', after: '31das312', commits: commits - ) + ) expect(pipeline).to be_persisted expect(pipeline.builds.count(:all)).to eq(2) @@ -150,7 +150,7 @@ describe CreateCommitBuildsService, services: true do before: '00000000', after: '31das312', commits: commits - ) + ) expect(pipeline).to be_persisted expect(pipeline.builds.count(:all)).to eq(2) end @@ -165,7 +165,7 @@ describe CreateCommitBuildsService, services: true do before: '00000000', after: '31das312', commits: commits - ) + ) expect(pipeline).to be_persisted expect(pipeline.status).to eq("failed") |