diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-07-29 19:13:27 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-07-29 19:13:27 +0000 |
| commit | ed80d3e95b64caab541ffd33aba2e0e6f2f94bdd (patch) | |
| tree | 7e1a2c6c0bc3e6462ee6ffd966d80ff32b529887 | |
| parent | a8b29b78caf792013cfcbb01e3fc7e4ff025b354 (diff) | |
| parent | a117fc178e08b46a0ee8640b97450183f4e83163 (diff) | |
| download | gitlab-ce-ed80d3e95b64caab541ffd33aba2e0e6f2f94bdd.tar.gz | |
Merge branch 'tp-qtt182-4' into 'master'
Change qa-* to rspec-* for save-merge-request-changes
Closes gitlab-org/quality/team-tasks#182
See merge request gitlab-org/gitlab-ce!31205
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 3403564992e..ba412b550f1 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -35,7 +35,7 @@ = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form js-mr-settings-form" }, authenticity_token: true do |f| %input{ name: 'update_section', type: 'hidden', value: 'js-merge-request-settings' } = render 'projects/merge_request_settings', form: f - = f.submit _('Save changes'), class: "btn btn-success qa-save-merge-request-changes" + = f.submit _('Save changes'), class: "btn btn-success qa-save-merge-request-changes rspec-save-merge-request-changes" = render_if_exists 'projects/merge_request_approvals_settings', expanded: expanded diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb index 0739726f52c..9f09c5c4501 100644 --- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb @@ -94,7 +94,7 @@ describe 'Projects > Settings > User manages merge request settings' do it 'when unchecked sets :printing_merge_request_link_enabled to false' do uncheck('project_printing_merge_request_link_enabled') within('.merge-request-settings-form') do - find('.qa-save-merge-request-changes') + find('.rspec-save-merge-request-changes') click_on('Save changes') end |