From dc6afd575fdcceb51e44565e68f4db9bf3e19124 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Wed, 20 Jul 2016 01:29:44 +0800
Subject: [PATCH] Just use default_branch, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13176885
---
spec/models/build_spec.rb | 8 ++++----
spec/requests/api/builds_spec.rb | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index e4fdfdcf03e..d01a066f4f6 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -6,7 +6,7 @@ describe Ci::Build, models: true do
let(:pipeline) do
create(:ci_pipeline, project: project,
sha: project.commit.id,
- ref: 'fix',
+ ref: project.default_branch,
status: 'success')
end
@@ -680,8 +680,8 @@ describe Ci::Build, models: true do
end
context 'with succeed pipeline' do
- it 'returns builds for ref' do
- builds = project.latest_successful_builds_for('fix')
+ it 'returns builds for ref for default_branch' do
+ builds = project.latest_successful_builds_for
expect(builds).to contain_exactly(build)
end
@@ -700,7 +700,7 @@ describe Ci::Build, models: true do
end
it 'returns empty relation' do
- builds = project.latest_successful_builds_for('fix')
+ builds = project.latest_successful_builds_for
expect(builds).to be_kind_of(ActiveRecord::Relation)
expect(builds).to be_empty
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index f28c027287f..2782d7e0490 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -192,8 +192,8 @@ describe API::API, api: true do
let(:pipeline) do
create(:ci_pipeline,
project: project,
- sha: project.commit('fix').sha,
- ref: 'fix')
+ sha: project.commit.sha,
+ ref: project.default_branch)
end
let(:build) { create(:ci_build, :success, :artifacts, pipeline: pipeline) }
--
GitLab