fixed specs + docs
This commit is contained in:
parent
cd04235efe
commit
b86640fee9
|
@ -3,7 +3,7 @@
|
|||
.pull-right
|
||||
- if can?(current_user, :update_pipeline, pipeline.project)
|
||||
- if pipeline.builds.latest.failed.any?(&:retryable?)
|
||||
= link_to "Retry failed", 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: '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
|
||||
|
|
|
@ -163,7 +163,7 @@ Example of response
|
|||
}
|
||||
```
|
||||
|
||||
## Retry failed builds in a pipeline
|
||||
## Retry builds in a pipeline
|
||||
|
||||
> [Introduced][ce-5837] in GitLab 8.11
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ module API
|
|||
present pipeline, with: Entities::Pipeline
|
||||
end
|
||||
|
||||
desc 'Retry failed builds in the pipeline' do
|
||||
desc 'Retry builds in the pipeline' do
|
||||
detail 'This feature was introduced in GitLab 8.11.'
|
||||
success Entities::Pipeline
|
||||
end
|
||||
|
|
|
@ -153,7 +153,7 @@ describe 'Commits' do
|
|||
expect(page).to have_content pipeline.git_author_name
|
||||
expect(page).to have_link('Download artifacts')
|
||||
expect(page).not_to have_link('Cancel running')
|
||||
expect(page).not_to have_link('Retry failed')
|
||||
expect(page).not_to have_link('Retry')
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -172,7 +172,7 @@ describe 'Commits' do
|
|||
expect(page).to have_content pipeline.git_author_name
|
||||
expect(page).not_to have_link('Download artifacts')
|
||||
expect(page).not_to have_link('Cancel running')
|
||||
expect(page).not_to have_link('Retry failed')
|
||||
expect(page).not_to have_link('Retry')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -54,7 +54,7 @@ describe 'Pipeline', :feature, :js do
|
|||
expect(page).to have_content('Build')
|
||||
expect(page).to have_content('Test')
|
||||
expect(page).to have_content('Deploy')
|
||||
expect(page).to have_content('Retry failed')
|
||||
expect(page).to have_content('Retry')
|
||||
expect(page).to have_content('Cancel running')
|
||||
end
|
||||
|
||||
|
@ -164,9 +164,9 @@ describe 'Pipeline', :feature, :js do
|
|||
it { expect(page).not_to have_content('retried') }
|
||||
|
||||
context 'when retrying' do
|
||||
before { click_on 'Retry failed' }
|
||||
before { click_on 'Retry' }
|
||||
|
||||
it { expect(page).not_to have_content('Retry failed') }
|
||||
it { expect(page).not_to have_content('Retry') }
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -198,7 +198,7 @@ describe 'Pipeline', :feature, :js do
|
|||
expect(page).to have_content(build_failed.id)
|
||||
expect(page).to have_content(build_running.id)
|
||||
expect(page).to have_content(build_external.id)
|
||||
expect(page).to have_content('Retry failed')
|
||||
expect(page).to have_content('Retry')
|
||||
expect(page).to have_content('Cancel running')
|
||||
expect(page).to have_link('Play')
|
||||
end
|
||||
|
@ -226,9 +226,9 @@ describe 'Pipeline', :feature, :js do
|
|||
it { expect(page).not_to have_content('retried') }
|
||||
|
||||
context 'when retrying' do
|
||||
before { click_on 'Retry failed' }
|
||||
before { click_on 'Retry' }
|
||||
|
||||
it { expect(page).not_to have_content('Retry failed') }
|
||||
it { expect(page).not_to have_content('Retry') }
|
||||
it { expect(page).to have_selector('.retried') }
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue