Merge branch 'fix/pipeline-settings-page' into 'master'
Fix save button on pipelines settings page ## What does this MR do? This MR fixes 'Save button' on pipeline settings page, which didn't change state to enabled after saving settings. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? Closes #23431 See merge request !6955
This commit is contained in:
commit
146e0cbc4d
|
@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
|
|||
|
||||
## 8.13.0 (2016-10-22)
|
||||
|
||||
- Fix save button on project pipeline settings page. (!6955)
|
||||
- Avoid race condition when asynchronously removing expired artifacts. (!6881)
|
||||
- Improve Merge When Build Succeeds triggers and execute on pipeline success. (!6675)
|
||||
- Respond with 404 Not Found for non-existent tags (Linus Thiel)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
.col-lg-9
|
||||
%h5.prepend-top-0
|
||||
Pipelines
|
||||
= form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project), remote: true, authenticity_token: true do |f|
|
||||
= form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project) do |f|
|
||||
%fieldset.builds-feature
|
||||
- unless @repository.gitlab_ci_yml
|
||||
.form-group
|
||||
|
|
|
@ -24,11 +24,12 @@ feature "Pipelines settings", feature: true do
|
|||
context 'for master' do
|
||||
given(:role) { :master }
|
||||
|
||||
scenario 'be allowed to change' do
|
||||
scenario 'be allowed to change', js: true do
|
||||
fill_in('Test coverage parsing', with: 'coverage_regex')
|
||||
click_on 'Save changes'
|
||||
|
||||
expect(page.status_code).to eq(200)
|
||||
expect(page).to have_button('Save changes', disabled: false)
|
||||
expect(page).to have_field('Test coverage parsing', with: 'coverage_regex')
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue