diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-18 12:53:30 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-18 12:53:30 +0200 |
commit | 4622f7e298edeb7211b94f3634f79dfc78db3918 (patch) | |
tree | 3f5508ecd7492efe1df2db0feaa2f861a872aff0 | |
parent | c9d7ba4d696bfd0198ac75db6e1b2a08b4517f82 (diff) | |
download | gitlab-ce-4622f7e298edeb7211b94f3634f79dfc78db3918.tar.gz |
Reload pipeline settings when saving new settings
-rw-r--r-- | app/views/projects/pipelines_settings/show.html.haml | 2 | ||||
-rw-r--r-- | spec/features/pipelines_settings_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/pipelines_settings/show.html.haml b/app/views/projects/pipelines_settings/show.html.haml index 8c7222bfe3d..0740e9b56ab 100644 --- a/app/views/projects/pipelines_settings/show.html.haml +++ b/app/views/projects/pipelines_settings/show.html.haml @@ -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 diff --git a/spec/features/pipelines_settings_spec.rb b/spec/features/pipelines_settings_spec.rb index dcc364a3d01..76cb240ea98 100644 --- a/spec/features/pipelines_settings_spec.rb +++ b/spec/features/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 |