summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-10-18 13:48:25 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-10-18 13:48:25 +0000
commit146e0cbc4dfb857e0eb44777c40da5df56f376e0 (patch)
treeec37c5d770a330a6e80b94fd8dadbdc518ef7398 /spec
parentc7e2b1a882a2d3a5e95fb741ca5dc6f19d915f2c (diff)
parente01e2ad5d3371ee6ebdceedf023e1052aa9e6c06 (diff)
downloadgitlab-ce-146e0cbc4dfb857e0eb44777c40da5df56f376e0.tar.gz
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
Diffstat (limited to 'spec')
-rw-r--r--spec/features/projects/settings/pipelines_settings_spec.rb (renamed from spec/features/pipelines_settings_spec.rb)3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index dcc364a3d01..76cb240ea98 100644
--- a/spec/features/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -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