kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add feature specs for settings page 

Add spec for form fields
Style settings sections
This commit is contained in:
Reuben Pereira 2019-03-14 23:50:21 +00:00 committed by Mike Greiling
parent d3d24bb4a5
commit cc2ed858a4
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/pages/settings.scss
View File

@ -23,7 +23,10 @@
} }
.settings { .settings {
border-bottom: 1px solid $gray-darker; // border-top for each item except the top one
+ .settings {
border-top: 1px solid $border-color;
}
&:first-of-type { &:first-of-type {
margin-top: 10px; margin-top: 10px;

2
app/views/projects/settings/operations/_error_tracking.html.haml
View File

@ -2,7 +2,7 @@
- setting = error_tracking_setting - setting = error_tracking_setting
%section.settings.expanded.border-0.no-animate %section.settings.expanded.no-animate
.settings-header .settings-header
%h4 %h4
= _('Error Tracking') = _('Error Tracking')

1
app/views/projects/settings/operations/show.html.haml
View File

@ -2,5 +2,6 @@
- page_title _('Operations Settings') - page_title _('Operations Settings')
- breadcrumb_title _('Operations Settings') - breadcrumb_title _('Operations Settings')
= render_if_exists 'projects/settings/operations/incidents'
= render 'projects/settings/operations/error_tracking', expanded: true = render 'projects/settings/operations/error_tracking', expanded: true
= render_if_exists 'projects/settings/operations/tracing' = render_if_exists 'projects/settings/operations/tracing'

1
spec/views/projects/settings/operations/show.html.haml_spec.rb
View File

@ -18,6 +18,7 @@ describe 'projects/settings/operations/show' do
allow(view).to receive(:error_tracking_setting) allow(view).to receive(:error_tracking_setting)
.and_return(error_tracking_setting) .and_return(error_tracking_setting)
allow(view).to receive(:current_user).and_return(user) allow(view).to receive(:current_user).and_return(user)
allow(view).to receive(:incident_management_available?) { false }
end end
let!(:error_tracking_setting) do let!(:error_tracking_setting) do