summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-08-11 22:54:25 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-08-11 22:54:25 +0200
commit4ccf39cde7356bf98bef5aae694257fb2c001e75 (patch)
treee5acf2ae15a7223eeb45811ded8446dcd9d57c64 /spec/models
parent6a6a69f4afbe0107a75df018b662f02b5ec0166a (diff)
downloadgitlab-ce-4ccf39cde7356bf98bef5aae694257fb2c001e75.tar.gz
Fix test failures, that did occur because of missing previously used `reload_status!` call
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/ci/pipeline_spec.rb24
1 files changed, 10 insertions, 14 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index eb762276cbe..adfe4bdd0c8 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -120,22 +120,18 @@ describe Ci::Pipeline, models: true do
end
end
- describe '#update_counters' do
- let(:pipeline) { create :ci_empty_pipeline, project: project }
+ describe '#duration' do
+ let(:current) { Time.now.change(usec: 0) }
+ let!(:build) { create :ci_build, name: 'build1', pipeline: pipeline, started_at: current - 60, finished_at: current }
+ let!(:build2) { create :ci_build, name: 'build2', pipeline: pipeline, started_at: current - 60, finished_at: current }
- context 'updates' do
- let(:current) { Time.now.change(usec: 0) }
- let(:build) { FactoryGirl.create :ci_build, pipeline: pipeline, started_at: current - 120, finished_at: current - 60 }
-
- before do
- build.skip
- end
+ before do
+ build.skip
+ build2.skip
+ end
- [:status, :started_at, :finished_at, :duration].each do |param|
- it "#{param}" do
- expect(pipeline.reload.send(param)).to eq(build.send(param))
- end
- end
+ it 'matches sum of builds duration' do
+ expect(pipeline.reload.duration).to eq(build.duration + build2.duration)
end
end