Removed options from the gear button in the projects and consolidated into one

Added test for the CiCdPipelinesController

2 files changed, 22 insertions, 14 deletions

diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index d6c158b6de3..bd170d5ca32 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -18,20 +18,8 @@
         Protected Branches
 
   - if @project.feature_available?(:builds, current_user)
-    = nav_link(controller: :runners) do
-      = link_to namespace_project_runners_path(@project.namespace, @project), title: 'Runners' do
-        %span
-          Runners
-    = nav_link(controller: :variables) do
-      = link_to namespace_project_variables_path(@project.namespace, @project), title: 'Variables' do
-        %span
-          Variables
-    = nav_link(controller: :triggers) do
-      = link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do
-        %span
-          Triggers
-    = nav_link(controller: :pipelines_settings) do
-      = link_to namespace_project_pipelines_settings_path(@project.namespace, @project), title: 'CI/CD Pipelines' do
+    = nav_link(controller: :ci_cd_pipelines_settings) do
+      = link_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project), title: 'CI/CD Pipelines' do
         %span
           CI/CD Pipelines
   = nav_link(controller: :pages) do
diff --git a/spec/controllers/projects/settings/ci_cd_pipelines_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_pipelines_controller_spec.rb
new file mode 100644
index 00000000000..15e070bd52b
--- /dev/null
+++ b/spec/controllers/projects/settings/ci_cd_pipelines_controller_spec.rb
@@ -0,0 +1,20 @@
+require('spec_helper')
+
+describe Projects::Settings::CiCdPipelinesController do
+  let(:project) { create(:empty_project, :public, :access_requestable) }
+  let(:user) { create(:user) }
+
+  before do
+    project.team << [user, :master]
+    sign_in(user)
+  end
+
+  describe 'GET show' do
+    it 'renders show with 200 status code' do
+      get :show, namespace_id: project.namespace, project_id: project
+
+      expect(response).to have_http_status(200)
+      expect(response).to render_template(:show)
+    end
+  end
+end