From 20037e61122a688366060f9427506962048e77ed Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 7 Jul 2016 21:03:21 +0800 Subject: Introduce Project#builds_for(build_name, ref = 'HEAD'): So that we could find the particular builds according to build_name and ref. It would be used to find the latest build artifacts from a particular branch or tag. --- spec/models/build_spec.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index e8171788872..8e3c9672fd5 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -673,7 +673,7 @@ describe Ci::Build, models: true do context 'when build is running' do before { build.run! } - it 'should return false' do + it 'returns false' do expect(build.retryable?).to be false end end @@ -681,9 +681,17 @@ describe Ci::Build, models: true do context 'when build is finished' do before { build.success! } - it 'should return true' do + it 'returns true' do expect(build.retryable?).to be true end end end + + describe 'Project#builds_for' do + it 'returns builds from ref and build name' do + latest_build = project.builds_for(build.name, 'HEAD').latest.first + + expect(latest_build.id).to eq(build.id) + end + end end -- cgit v1.2.1 From 1e3ff09cf3cd78755e83288559cfb1cf0ff6539f Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 7 Jul 2016 21:18:10 +0800 Subject: Avoid ambiguous syntax --- spec/models/build_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index 8e3c9672fd5..cb432a99cd2 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -674,7 +674,7 @@ describe Ci::Build, models: true do before { build.run! } it 'returns false' do - expect(build.retryable?).to be false + expect(build.retryable?).to be(false) end end @@ -682,7 +682,7 @@ describe Ci::Build, models: true do before { build.success! } it 'returns true' do - expect(build.retryable?).to be true + expect(build.retryable?).to be(true) end end end -- cgit v1.2.1 From 8f469c33cc8b90e1bcae8ddd5599ce2a2957a3af Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 7 Jul 2016 21:18:54 +0800 Subject: Multiline for before block --- spec/models/build_spec.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index cb432a99cd2..47ba4931460 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -671,7 +671,9 @@ describe Ci::Build, models: true do describe '#retryable?' do context 'when build is running' do - before { build.run! } + before do + build.run! + end it 'returns false' do expect(build.retryable?).to be(false) @@ -679,7 +681,9 @@ describe Ci::Build, models: true do end context 'when build is finished' do - before { build.success! } + before do + build.success! + end it 'returns true' do expect(build.retryable?).to be(true) -- cgit v1.2.1 From a1eac5e4de95a4d27b30432c527ab410e9d77787 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 12 Jul 2016 19:20:31 +0800 Subject: Doh. I already wrote that test and I forgot. --- spec/models/build_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index 47ba4931460..c7c247189f5 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -693,9 +693,9 @@ describe Ci::Build, models: true do describe 'Project#builds_for' do it 'returns builds from ref and build name' do - latest_build = project.builds_for(build.name, 'HEAD').latest.first + build_ids = project.builds_for(build.name, 'HEAD').map(&:id) - expect(latest_build.id).to eq(build.id) + expect(build_ids).to eq([build.id]) end end end -- cgit v1.2.1 From 6597c213c341ae072216c125a97f94a174fc3dfa Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 12 Jul 2016 19:28:21 +0800 Subject: Prefer empty relation rather than arrays --- spec/models/build_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index c7c247189f5..b1354faa722 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -697,5 +697,11 @@ describe Ci::Build, models: true do expect(build_ids).to eq([build.id]) end + + it 'returns empty relation if the build cannot be found' do + builds = project.builds_for(build.name, 'TAIL').all + + expect(builds).to be_empty + end end end -- cgit v1.2.1 From 53a9dee6cb54b75fa2999b4a33a59928b3b73ec3 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 15 Jul 2016 02:22:29 +0800 Subject: Introduce Project#latest_success_builds_for: So it's more accessible for views to access the names of jobs. Only filter Build#name from where we really need to download it. --- spec/models/build_spec.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index b1354faa722..7c95463a571 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -691,15 +691,19 @@ describe Ci::Build, models: true do end end - describe 'Project#builds_for' do - it 'returns builds from ref and build name' do - build_ids = project.builds_for(build.name, 'HEAD').map(&:id) + describe 'Project#latest_success_builds_for' do + before do + build.update(status: 'success') + end + + it 'returns builds from ref' do + build_ids = project.latest_success_builds_for('HEAD').map(&:id) expect(build_ids).to eq([build.id]) end it 'returns empty relation if the build cannot be found' do - builds = project.builds_for(build.name, 'TAIL').all + builds = project.latest_success_builds_for('TAIL').all expect(builds).to be_empty end -- cgit v1.2.1 From 5151ebf4c68b3ac87d51474b49962f0e5ba6d3e7 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Mon, 18 Jul 2016 13:37:00 +0800 Subject: Use RSpec helpers, feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13125543 --- spec/models/build_spec.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index 7c95463a571..b2dcbd8da2e 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -628,7 +628,7 @@ describe Ci::Build, models: true do describe '#erasable?' do subject { build.erasable? } - it { is_expected.to eq true } + it { is_expected.to be_truthy } end describe '#erased?' do @@ -636,7 +636,7 @@ describe Ci::Build, models: true do subject { build.erased? } context 'build has not been erased' do - it { is_expected.to be false } + it { is_expected.to be_falsey } end context 'build has been erased' do @@ -644,12 +644,13 @@ describe Ci::Build, models: true do build.erase end - it { is_expected.to be true } + it { is_expected.to be_truthy } end end context 'metadata and build trace are not available' do let!(:build) { create(:ci_build, :success, :artifacts) } + before do build.remove_artifacts_metadata! end @@ -676,7 +677,7 @@ describe Ci::Build, models: true do end it 'returns false' do - expect(build.retryable?).to be(false) + expect(build).not_to be_retryable end end @@ -686,7 +687,7 @@ describe Ci::Build, models: true do end it 'returns true' do - expect(build.retryable?).to be(true) + expect(build).to be_retryable end end end -- cgit v1.2.1 From 6830e2821f16d832963320aae571612f50a8aaa0 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Mon, 18 Jul 2016 14:00:39 +0800 Subject: Match against records rather than id, feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13125605 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13125611 --- spec/models/build_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index b2dcbd8da2e..a57f0b6886c 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -698,9 +698,9 @@ describe Ci::Build, models: true do end it 'returns builds from ref' do - build_ids = project.latest_success_builds_for('HEAD').map(&:id) + builds = project.latest_success_builds_for('HEAD') - expect(build_ids).to eq([build.id]) + expect(builds).to contain_exactly(build) end it 'returns empty relation if the build cannot be found' do -- cgit v1.2.1 From 85409a5a10d22bebbc54a9c7b7c76e7c0e11b208 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Mon, 18 Jul 2016 20:10:50 +0800 Subject: Use ci_commits.ref (Pipeline#ref) to find builds --- spec/models/build_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index a57f0b6886c..53064138a50 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -5,7 +5,8 @@ describe Ci::Build, models: true do let(:pipeline) do create(:ci_pipeline, project: project, - sha: project.commit.id) + sha: project.commit.id, + ref: 'fix') end let(:build) { create(:ci_build, pipeline: pipeline) } @@ -698,7 +699,7 @@ describe Ci::Build, models: true do end it 'returns builds from ref' do - builds = project.latest_success_builds_for('HEAD') + builds = project.latest_success_builds_for('fix') expect(builds).to contain_exactly(build) end -- cgit v1.2.1 From af86b8c2c2b6fb08ea55eb89f1dd20aba81862ae Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Mon, 18 Jul 2016 21:11:53 +0800 Subject: Latest success pipelines (rather than builds) --- spec/models/build_spec.rb | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index 53064138a50..8a8a4b46f08 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -6,7 +6,8 @@ describe Ci::Build, models: true do let(:pipeline) do create(:ci_pipeline, project: project, sha: project.commit.id, - ref: 'fix') + ref: 'fix', + status: 'success') end let(:build) { create(:ci_build, pipeline: pipeline) } @@ -694,20 +695,38 @@ describe Ci::Build, models: true do end describe 'Project#latest_success_builds_for' do + let(:build) do + create(:ci_build, :artifacts, :success, pipeline: pipeline) + end + before do - build.update(status: 'success') + build end - it 'returns builds from ref' do - builds = project.latest_success_builds_for('fix') + context 'with succeed pipeline' do + it 'returns builds from ref' do + builds = project.latest_success_builds_for('fix') + + expect(builds).to contain_exactly(build) + end + + it 'returns empty relation if the build cannot be found' do + builds = project.latest_success_builds_for('TAIL').all - expect(builds).to contain_exactly(build) + expect(builds).to be_empty + end end - it 'returns empty relation if the build cannot be found' do - builds = project.latest_success_builds_for('TAIL').all + context 'with pending pipeline' do + before do + pipeline.update(status: 'pending') + end - expect(builds).to be_empty + it 'returns empty relation' do + builds = project.latest_success_builds_for('fix').all + + expect(builds).to be_empty + end end end end -- cgit v1.2.1 From 85ceb8b72f5a67d21bc9530fe835fdece98f3d4e Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 19 Jul 2016 17:51:45 +0800 Subject: Rename latest_success* to latest_successful: Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_13164642 --- spec/models/build_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index d435cd745b3..355cb8fdfff 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -678,7 +678,7 @@ describe Ci::Build, models: true do end end - describe 'Project#latest_success_builds_for' do + describe 'Project#latest_successful_builds_for' do let(:build) do create(:ci_build, :artifacts, :success, pipeline: pipeline) end @@ -689,13 +689,13 @@ describe Ci::Build, models: true do context 'with succeed pipeline' do it 'returns builds from ref' do - builds = project.latest_success_builds_for('fix') + builds = project.latest_successful_builds_for('fix') expect(builds).to contain_exactly(build) end it 'returns empty relation if the build cannot be found' do - builds = project.latest_success_builds_for('TAIL').all + builds = project.latest_successful_builds_for('TAIL').all expect(builds).to be_empty end @@ -707,7 +707,7 @@ describe Ci::Build, models: true do end it 'returns empty relation' do - builds = project.latest_success_builds_for('fix').all + builds = project.latest_successful_builds_for('fix').all expect(builds).to be_empty end -- cgit v1.2.1 From 2d9e7468de7edfe1868b8d9dc6dcdaff116f0da8 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 21 Jul 2016 20:00:33 +0800 Subject: They were moved to project_spec.rb --- spec/models/build_spec.rb | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'spec/models/build_spec.rb') diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb index 950580fdee3..13ef60b732a 100644 --- a/spec/models/build_spec.rb +++ b/spec/models/build_spec.rb @@ -915,40 +915,4 @@ describe Ci::Build, models: true do end end end - - describe 'Project#latest_successful_builds_for' do - let(:build) do - create(:ci_build, :artifacts, :success, pipeline: pipeline) - end - - before do - build - end - - context 'with succeed pipeline' do - it 'returns builds from ref' do - builds = project.latest_successful_builds_for('fix') - - expect(builds).to contain_exactly(build) - end - - it 'returns empty relation if the build cannot be found' do - builds = project.latest_successful_builds_for('TAIL').all - - expect(builds).to be_empty - end - end - - context 'with pending pipeline' do - before do - pipeline.update(status: 'pending') - end - - it 'returns empty relation' do - builds = project.latest_successful_builds_for('fix').all - - expect(builds).to be_empty - end - end - end end -- cgit v1.2.1