From 85fc83c5888411bcc1ee7ec7dc75a7d902f821cb Mon Sep 17 00:00:00 2001
From: ubudzisz <ubudzisz@gmail.com>
Date: Thu, 14 Jul 2016 14:51:10 +0200
Subject: [PATCH] add test to view
repair rubocop test and update CHANGELOG
repair rubocop test
repair rubocop
repair rubocop
repair rubocop
---
CHANGELOG | 1 +
.../projects/builds/show.html.haml_spec.rb | 25 ++++++++++++-------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index e5b93a53cf0..64cf8a2c5ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -129,6 +129,7 @@ v 8.9.7 (unreleased)
v 8.9.6
- Fix importing of events under notes for GitLab projects
- Render only commit message title in builds
+ - Render only commit message title in builds (Katarzyna Kobierska Ula Budziszewska)
v 8.9.5
- Add more debug info to import/export and memory killer. !5108
diff --git a/spec/views/projects/builds/show.html.haml_spec.rb b/spec/views/projects/builds/show.html.haml_spec.rb
index c66f15e3c0b..c71705fe8e5 100644
--- a/spec/views/projects/builds/show.html.haml_spec.rb
+++ b/spec/views/projects/builds/show.html.haml_spec.rb
@@ -3,12 +3,15 @@ require 'spec_helper'
describe 'projects/builds/show' do
include Devise::TestHelpers
- let(:build) { create(:ci_build) }
- let(:project) { build.project }
+ let(:project) { create(:project) }
+ let(:pipeline) { create(:ci_pipeline, project: project) }
+ let(:build) { create(:ci_build, pipeline: pipeline) }
+ let(:commit) { project.commit }
before do
assign(:build, build)
assign(:project, project)
+ assign(:commit_title, build.project.commit.title)
allow(view).to receive(:can?).and_return(true)
end
@@ -22,10 +25,6 @@ describe 'projects/builds/show' do
it 'does not show retry button' do
expect(rendered).not_to have_link('Retry')
end
-
- it 'shows commit title' do
- expect(rendered).to have_text(@git_commit_title)
- end
end
context 'when build is not running' do
@@ -37,10 +36,18 @@ describe 'projects/builds/show' do
it 'shows retry button' do
expect(rendered).to have_link('Retry')
end
+ end
- it 'shows commit title' do
- expect(rendered).to have_text(@git_commit_title)
+ context 'show commit title' do
+ before do
+ build.run!
+ render
end
- end
+ it 'show commit title' do
+ within('p.build-light-text.append-bottom-0') do
+ assert page.has_content?(commit.title)
+ end
+ end
+ end
end
--
GitLab