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

fix more tests

This commit is contained in:
dimitrieh 2017-02-21 13:25:42 +01:00
parent b86640fee9
commit 8b14e164a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/commit/_pipeline.html.haml
View File

@ -3,7 +3,7 @@
.pull-right
- if can?(current_user, :update_pipeline, pipeline.project)
- if pipeline.builds.latest.failed.any?(&:retryable?)
= link_to "Retry", retry_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: 'btn btn-grouped btn-primary', method: :post
= link_to "Retry", retry_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: 'js-retry-button btn btn-grouped btn-primary', method: :post
- if pipeline.builds.running_or_pending.any?
= link_to "Cancel running", cancel_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post

4
spec/features/projects/pipelines/pipeline_spec.rb
View File

@ -164,7 +164,7 @@ describe 'Pipeline', :feature, :js do
it { expect(page).not_to have_content('retried') }
context 'when retrying' do
before { click_on 'Retry' }
before { click_link('Retry', class: 'js-retry-button') }
it { expect(page).not_to have_content('Retry') }
end
@ -226,7 +226,7 @@ describe 'Pipeline', :feature, :js do
it { expect(page).not_to have_content('retried') }
context 'when retrying' do
before { click_on 'Retry' }
before { click_link('Retry', class: 'js-retry-button') }
it { expect(page).not_to have_content('Retry') }
it { expect(page).to have_selector('.retried') }