Fix spec failures
This commit is contained in:
parent
4e60f79e40
commit
2f3dc314f4
|
@ -10,5 +10,3 @@
|
|||
- else
|
||||
= render_status_with_link('build', subject.status)
|
||||
= ci_icon_for_status(subject.status)
|
||||
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
- if grouped_statuses.one?
|
||||
- status = grouped_statuses.first
|
||||
- is_playable = status.playable? && can?(current_user, :update_build, @project)
|
||||
%li.build{class: ("playable" if is_playable)}
|
||||
%li.build{ class: ("playable" if is_playable) }
|
||||
.curve
|
||||
.build-content
|
||||
= render "projects/#{status.to_partial_path}_pipeline", subject: status
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
- group_status = CommitStatus.where(id: subject).status
|
||||
= render_status_with_link('build', group_status)
|
||||
.dropdown.inline
|
||||
%button.dropdown-menu-toggle{type: 'button', data: {toggle: 'dropdown'}}
|
||||
%button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } }
|
||||
%span.ci-status-text
|
||||
= name
|
||||
%span.badge= subject.length
|
||||
%span.badge= subject.size
|
||||
%ul.dropdown-menu.grouped-pipeline-dropdown
|
||||
.arrow
|
||||
- subject.each do |status|
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- if subject.target_url
|
||||
- link_to subject.target_url do
|
||||
= link_to subject.target_url do
|
||||
= render_status_with_link('commit status', subject.status)
|
||||
%span.ci-status-text= subject.name
|
||||
- else
|
||||
|
|
|
@ -4,15 +4,14 @@ describe 'projects/pipelines/show' do
|
|||
include Devise::TestHelpers
|
||||
|
||||
let(:project) { create(:project) }
|
||||
let(:pipeline) do
|
||||
create(:ci_empty_pipeline, project: project,
|
||||
sha: project.commit.id)
|
||||
end
|
||||
let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.id) }
|
||||
|
||||
before do
|
||||
controller.prepend_view_path('app/views/projects')
|
||||
|
||||
create_build('build', 0, 'build')
|
||||
create_build('test', 1, 'rspec 0 2')
|
||||
create_build('test', 1, 'rspec 1 2')
|
||||
create_build('test', 1, 'rspec 0:2')
|
||||
create_build('test', 1, 'rspec 1:2')
|
||||
create_build('test', 1, 'audit')
|
||||
create_build('deploy', 2, 'production')
|
||||
|
||||
|
@ -38,7 +37,7 @@ describe 'projects/pipelines/show' do
|
|||
|
||||
# builds
|
||||
expect(rendered).to have_text('rspec')
|
||||
expect(rendered).to have_text('rspec 0:1')
|
||||
expect(rendered).to have_text('rspec 0:2')
|
||||
expect(rendered).to have_text('production')
|
||||
expect(rendered).to have_text('jenkins')
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue