Commit 93eb844d authored by Kamil Trzcinski's avatar Kamil Trzcinski

Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3

parents 9839bbae 8988c874
...@@ -408,7 +408,7 @@ describe Project, models: true do ...@@ -408,7 +408,7 @@ describe Project, models: true do
it { is_expected.to eq(pipeline) } it { is_expected.to eq(pipeline) }
context 'return latest' do context 'return latest' do
let(:pipeline2) { create :pipeline, project: project, ref: 'master' } let(:pipeline2) { create :ci_pipeline, project: project, ref: 'master' }
before do before do
pipeline pipeline
......
...@@ -74,7 +74,7 @@ describe CreateCommitBuildsService, services: true do ...@@ -74,7 +74,7 @@ describe CreateCommitBuildsService, services: true do
before: '00000000', before: '00000000',
after: '31das312', after: '31das312',
commits: commits commits: commits
) )
expect(pipeline).to be_persisted expect(pipeline).to be_persisted
expect(pipeline.builds.any?).to be false expect(pipeline.builds.any?).to be false
expect(pipeline.status).to eq('failed') expect(pipeline.status).to eq('failed')
...@@ -95,7 +95,7 @@ describe CreateCommitBuildsService, services: true do ...@@ -95,7 +95,7 @@ describe CreateCommitBuildsService, services: true do
before: '00000000', before: '00000000',
after: '31das312', after: '31das312',
commits: commits commits: commits
) )
expect(pipeline).to be_persisted expect(pipeline).to be_persisted
expect(pipeline.builds.any?).to be false expect(pipeline.builds.any?).to be false
expect(pipeline.status).to eq("skipped") expect(pipeline.status).to eq("skipped")
...@@ -110,7 +110,7 @@ describe CreateCommitBuildsService, services: true do ...@@ -110,7 +110,7 @@ describe CreateCommitBuildsService, services: true do
before: '00000000', before: '00000000',
after: '31das312', after: '31das312',
commits: commits commits: commits
) )
expect(pipeline).to be_persisted expect(pipeline).to be_persisted
expect(pipeline.builds.first.name).to eq("staging") expect(pipeline.builds.first.name).to eq("staging")
...@@ -124,7 +124,7 @@ describe CreateCommitBuildsService, services: true do ...@@ -124,7 +124,7 @@ describe CreateCommitBuildsService, services: true do
before: '00000000', before: '00000000',
after: '31das312', after: '31das312',
commits: commits commits: commits
) )
expect(pipeline).to be_persisted expect(pipeline).to be_persisted
expect(pipeline.builds.any?).to be false expect(pipeline.builds.any?).to be false
expect(pipeline.status).to eq("skipped") expect(pipeline.status).to eq("skipped")
...@@ -141,7 +141,7 @@ describe CreateCommitBuildsService, services: true do ...@@ -141,7 +141,7 @@ describe CreateCommitBuildsService, services: true do
before: '00000000', before: '00000000',
after: '31das312', after: '31das312',
commits: commits commits: commits
) )
expect(pipeline).to be_persisted expect(pipeline).to be_persisted
expect(pipeline.builds.count(:all)).to eq(2) expect(pipeline.builds.count(:all)).to eq(2)
...@@ -150,7 +150,7 @@ describe CreateCommitBuildsService, services: true do ...@@ -150,7 +150,7 @@ describe CreateCommitBuildsService, services: true do
before: '00000000', before: '00000000',
after: '31das312', after: '31das312',
commits: commits commits: commits
) )
expect(pipeline).to be_persisted expect(pipeline).to be_persisted
expect(pipeline.builds.count(:all)).to eq(2) expect(pipeline.builds.count(:all)).to eq(2)
end end
...@@ -165,7 +165,7 @@ describe CreateCommitBuildsService, services: true do ...@@ -165,7 +165,7 @@ describe CreateCommitBuildsService, services: true do
before: '00000000', before: '00000000',
after: '31das312', after: '31das312',
commits: commits commits: commits
) )
expect(pipeline).to be_persisted expect(pipeline).to be_persisted
expect(pipeline.status).to eq("failed") expect(pipeline.status).to eq("failed")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment