Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 3 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 f7da288b9f3..869defbb331 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -286,10 +286,20 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
     end
 
     describe 'Pipeline Editor' do
-      it 'has a link to the pipeline editor' do
-        render
+      context 'with a current_ref' do
+        it 'has a link to the pipeline editor' do
+          render
+
+          expect(rendered).to have_link('Editor', href: project_ci_pipeline_editor_path(project, params: { branch_name: current_ref }))
+        end
+      end
+
+      context 'with the default_branch' do
+        it 'has a link to the pipeline editor' do
+          render
 
-        expect(rendered).to have_link('Editor', href: project_ci_pipeline_editor_path(project))
+          expect(rendered).to have_link('Editor', href: project_ci_pipeline_editor_path(project, params: { branch_name: project.default_branch }))
+        end
       end
 
       context 'when user cannot access pipeline editor' do