diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-02 11:32:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-02 11:32:09 +0000 |
| commit | 305260df0606c2bacbc2aae54a1dc412ec14fe39 (patch) | |
| tree | f3cf46bf6799fbece1883f621e738944f90ee9a9 /app | |
| parent | 71008250b2fe63291f22b212bd196fb29ef0c177 (diff) | |
| parent | 20b45b8ce1557282e00283d74604cbfc2121ee8d (diff) | |
| download | gitlab-ce-305260df0606c2bacbc2aae54a1dc412ec14fe39.tar.gz | |
Merge branch 'qa/e2e-test-custom-email' into 'master'66360-zoom-for-incident-management-integration
Update views for testability and update page objects
See merge request gitlab-org/gitlab-ce!32451
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/preferences.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml index bd60ff0b99c..3dd72909805 100644 --- a/app/views/admin/application_settings/_email.html.haml +++ b/app/views/admin/application_settings/_email.html.haml @@ -25,4 +25,4 @@ = render_if_exists 'admin/application_settings/email_additional_text_setting', form: f - = f.submit _('Save changes'), class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success", data: { qa_selector: 'save_changes_button' } diff --git a/app/views/admin/application_settings/preferences.html.haml b/app/views/admin/application_settings/preferences.html.haml index c468d69d7b8..0ad76e56d0b 100644 --- a/app/views/admin/application_settings/preferences.html.haml +++ b/app/views/admin/application_settings/preferences.html.haml @@ -2,7 +2,7 @@ - page_title _("Preferences") - @content_class = "limit-container-width" unless fluid_layout -%section.settings.as-email.no-animate#js-email-settings{ class: ('expanded' if expanded_by_default?) } +%section.settings.as-email.no-animate#js-email-settings{ class: ('expanded' if expanded_by_default?), data: { qa_selector: 'email_section' } } .settings-header %h4 = _('Email') diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 9e92ced9f89..f76268bc29b 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -270,7 +270,7 @@ %span = _('Geo') = nav_link(path: 'application_settings#preferences') do - = link_to preferences_admin_application_settings_path, title: _('Preferences') do + = link_to preferences_admin_application_settings_path, title: _('Preferences'), data: { qa_selector: 'admin_settings_preferences_link' } do %span = _('Preferences') |