kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Changes after review

Browse source
This commit is contained in:
Filipa Lacerda 2016-12-07 15:27:22 +00:00
parent 2dc907bc17
commit 4eb53036c7
3 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/helpers/environment_helper.rb
View file

@ -14,14 +14,12 @@ module EnvironmentHelper
end
end
def deployment_link(deployment, text)
def deployment_link(deployment, text: nil)
return unless deployment
if text
link_to text, [deployment.project.namespace.becomes(Namespace), deployment.project, deployment.deployable]
else
link_to "##{deployment.iid}", [deployment.project.namespace.becomes(Namespace), deployment.project, deployment.deployable]
end
link_label = text ? text : "##{deployment.iid}"
link_to link_label, [deployment.project.namespace.becomes(Namespace), deployment.project, deployment.deployable]
end
def last_deployment_link_for_environment_build(project, build)

2
app/views/projects/builds/show.html.haml
View file

@ -46,7 +46,7 @@
- else
This build is creating a deployment to #{environment_link_for_build(@build.project, @build)}
- if environment.try(:last_deployment)
and will overwrite the #{deployment_link(environment.last_deployment, 'latest deployment')}
and will overwrite the #{deployment_link(environment.last_deployment, text: 'latest deployment')}
.prepend-top-default
- if @build.erased?

33
spec/features/projects/builds_spec.rb
View file

@ -229,39 +229,36 @@ feature 'Builds', :feature do
end
context 'when build starts environment' do
context 'build is successfull and has deployment' do
it 'shows a link for the build' do
environment = create(:environment, project: project)
pipeline = create(:ci_pipeline, project: project)
deployment = create(:deployment)
build1 = create(:ci_build, :success, environment: environment.name, deployments: [deployment], pipeline: pipeline)
let(:environment) { create(:environment, project: project) }
let(:pipeline) { create(:ci_pipeline, project: project) }
visit namespace_project_build_path(project.namespace, project, build1)
context 'build is successfull and has deployment' do
let(:deployment) { create(:deployment) }
let(:build) { create(:ci_build, :success, environment: environment.name, deployments: [deployment], pipeline: pipeline) }
it 'shows a link for the build' do
visit namespace_project_build_path(project.namespace, project, build)
expect(page).to have_link environment.name
end
end
context 'build is complete and not successfull' do
it 'shows a link for the build' do
environment = create(:environment, project: project)
pipeline = create(:ci_pipeline, project: project)
build1 = create(:ci_build, :failed, environment: environment.name, pipeline: pipeline)
let(:build) { create(:ci_build, :failed, environment: environment.name, pipeline: pipeline) }
visit namespace_project_build_path(project.namespace, project, build1)
it 'shows a link for the build' do
visit namespace_project_build_path(project.namespace, project, build)
expect(page).to have_link environment.name
end
end
context 'build creates a new deployment' do
it 'shows a link to lastest deployment' do
environment = create(:environment, project: project)
create(:deployment, environment: environment, sha: project.commit.id)
pipeline = create(:ci_pipeline, project: project)
build1 = create(:ci_build, :success, environment: environment.name, pipeline: pipeline)
let!(:deployment) { create(:deployment, environment: environment, sha: project.commit.id) }
let(:build) { create(:ci_build, :success, environment: environment.name, pipeline: pipeline) }
visit namespace_project_build_path(project.namespace, project, build1)
it 'shows a link to lastest deployment' do
visit namespace_project_build_path(project.namespace, project, build)
expect(page).to have_link('latest deployment')
end