Add latest changes from gitlab-org/gitlab@master

1 files changed, 58 insertions, 42 deletions

diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
index c501c418466..16362aed1cd 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -257,6 +257,64 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
     end
   end
 
+  describe 'CI/CD' do
+    it 'has a link to pipelines page' do
+      render
+
+      expect(rendered).to have_link('CI/CD', href: project_pipelines_path(project))
+    end
+
+    describe 'Artifacts' do
+      it 'has a link to the artifacts page' do
+        render
+
+        expect(rendered).to have_link('Artifacts', href: project_artifacts_path(project))
+      end
+    end
+
+    describe 'Jobs' do
+      it 'has a link to the jobs page' do
+        render
+
+        expect(rendered).to have_link('Jobs', href: project_jobs_path(project))
+      end
+    end
+
+    describe 'Pipeline Schedules' do
+      it 'has a link to the pipeline schedules page' do
+        render
+
+        expect(rendered).to have_link('Schedules', href: pipeline_schedules_path(project))
+      end
+    end
+
+    describe 'Pipelines' do
+      it 'has a link to the pipelines page' do
+        render
+
+        expect(rendered).to have_link('Pipelines', href: project_pipelines_path(project))
+      end
+    end
+
+    describe 'Pipeline Editor' do
+      it 'has a link to the pipeline editor' do
+        render
+
+        expect(rendered).to have_link('Editor', href: project_ci_pipeline_editor_path(project))
+      end
+
+      context 'when user cannot access pipeline editor' do
+        it 'does not has a link to the pipeline editor' do
+          allow(view).to receive(:can_view_pipeline_editor?).and_return(false)
+
+          render
+
+          expect(rendered).not_to have_link('Editor', href: project_ci_pipeline_editor_path(project))
+        end
+      end
+    end
+  end
+
   describe 'packages tab' do
     before do
       stub_container_registry_config(enabled: true)
@@ -419,48 +477,6 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
     end
   end
 
-  describe 'ci/cd settings tab' do
-    before do
-      project.update!(archived: project_archived)
-    end
-
-    context 'when project is archived' do
-      let(:project_archived) { true }
-
-      it 'does not show the ci/cd settings tab' do
-        render
-
-        expect(rendered).not_to have_link('CI/CD', href: project_settings_ci_cd_path(project))
-      end
-    end
-
-    context 'when project is active' do
-      let(:project_archived) { false }
-
-      it 'shows the ci/cd settings tab' do
-        render
-
-        expect(rendered).to have_link('CI/CD', href: project_settings_ci_cd_path(project))
-      end
-    end
-  end
-
-  describe 'pipeline editor link' do
-    it 'shows the pipeline editor link' do
-      render
-
-      expect(rendered).to have_link('Editor', href: project_ci_pipeline_editor_path(project))
-    end
-
-    it 'does not show the pipeline editor link' do
-      allow(view).to receive(:can_view_pipeline_editor?).and_return(false)
-
-      render
-
-      expect(rendered).not_to have_link('Editor', href: project_ci_pipeline_editor_path(project))
-    end
-  end
-
   describe 'operations settings tab' do
     describe 'archive projects' do
       before do