diff options
| author | dimitrieh <dimitriehoekstra@gmail.com> | 2017-02-21 13:25:42 +0100 |
|---|---|---|
| committer | dimitrieh <dimitriehoekstra@gmail.com> | 2017-02-21 13:25:42 +0100 |
| commit | 8b14e164a67387a465a701b10322c0c2a5053e83 (patch) | |
| tree | 06a5e1b4753314abe5c508a0fbd2f0a568b96e2d | |
| parent | b86640fee90a7bc7b752b0d66ac7310dd9673b23 (diff) | |
| download | gitlab-ce-8b14e164a67387a465a701b10322c0c2a5053e83.tar.gz | |
fix more tests
| -rw-r--r-- | app/views/projects/commit/_pipeline.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/projects/pipelines/pipeline_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml index 754bcb95ddb..c2b32a22170 100644 --- a/app/views/projects/commit/_pipeline.html.haml +++ b/app/views/projects/commit/_pipeline.html.haml @@ -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 diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb index e457a935d91..a8f557bd07d 100644 --- a/spec/features/projects/pipelines/pipeline_spec.rb +++ b/spec/features/projects/pipelines/pipeline_spec.rb @@ -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') } |