Commit 6a4aa3f9 authored by Ben Bodenmiller's avatar Ben Bodenmiller

Clarify that performance bar is not always on

parent 74511b04
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.form-check .form-check
= f.check_box :performance_bar_enabled, class: 'form-check-input' = f.check_box :performance_bar_enabled, class: 'form-check-input'
= f.label :performance_bar_enabled, class: 'form-check-label qa-enable-performance-bar-checkbox' do = f.label :performance_bar_enabled, class: 'form-check-label qa-enable-performance-bar-checkbox' do
Enable the Performance Bar Enable access to the Performance Bar
.form-group .form-group
= f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'label-bold' = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'label-bold'
= f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path = f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Enable the Performance Bar for a given group.') = _('Enable access to the Performance Bar for a given group.')
= link_to icon('question-circle'), help_page_path('administration/monitoring/performance/performance_bar') = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/performance_bar')
.settings-content .settings-content
= render 'performance_bar' = render 'performance_bar'
......
...@@ -3677,7 +3677,10 @@ msgstr "" ...@@ -3677,7 +3677,10 @@ msgstr ""
msgid "Enable shared Runners" msgid "Enable shared Runners"
msgstr "" msgstr ""
msgid "Enable the Performance Bar for a given group." msgid "Enable access to the Performance Bar for a given group."
msgstr ""
msgid "Enable access to the Performance Bar"
msgstr "" msgstr ""
msgid "Enable two-factor authentication" msgid "Enable two-factor authentication"
......
...@@ -302,22 +302,22 @@ describe 'Admin updates settings' do ...@@ -302,22 +302,22 @@ describe 'Admin updates settings' do
group = create(:group) group = create(:group)
page.within('.as-performance-bar') do page.within('.as-performance-bar') do
check 'Enable the Performance Bar' check 'Enable access to the Performance Bar'
fill_in 'Allowed group', with: group.path fill_in 'Allowed group', with: group.path
click_on 'Save changes' click_on 'Save changes'
end end
expect(page).to have_content "Application settings saved successfully" expect(page).to have_content "Application settings saved successfully"
expect(find_field('Enable the Performance Bar')).to be_checked expect(find_field('Enable access to the Performance Bar')).to be_checked
expect(find_field('Allowed group').value).to eq group.path expect(find_field('Allowed group').value).to eq group.path
page.within('.as-performance-bar') do page.within('.as-performance-bar') do
uncheck 'Enable the Performance Bar' uncheck 'Enable access to the Performance Bar'
click_on 'Save changes' click_on 'Save changes'
end end
expect(page).to have_content 'Application settings saved successfully' expect(page).to have_content 'Application settings saved successfully'
expect(find_field('Enable the Performance Bar')).not_to be_checked expect(find_field('Enable access to the Performance Bar')).not_to be_checked
expect(find_field('Allowed group').value).to be_nil expect(find_field('Allowed group').value).to be_nil
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment