Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb
index 9ec65dba586..aee2b0baf92 100644
--- a/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_admin.html.haml_spec.rb
@@ -91,4 +91,20 @@ describe 'layouts/nav/sidebar/_admin' do
     it_behaves_like 'page has active tab', 'Monitoring'
     it_behaves_like 'page has active sub tab', 'Background Jobs'
   end
+
+  context 'on settings' do
+    before do
+      render
+    end
+
+    it 'includes General link' do
+      expect(rendered).to have_link('General', href: general_admin_application_settings_path)
+    end
+
+    context 'when GitLab FOSS' do
+      it 'does not include Templates link' do
+        expect(rendered).not_to have_link('Templates', href: '/admin/application_settings/templates')
+      end
+    end
+  end
 end