Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 0 deletions

diff --git a/spec/requests/ide_controller_spec.rb b/spec/requests/ide_controller_spec.rb
index 151fa89b819..191fc2a6704 100644
--- a/spec/requests/ide_controller_spec.rb
+++ b/spec/requests/ide_controller_spec.rb
@@ -14,6 +14,8 @@ RSpec.describe IdeController do
   let_it_be(:creator) { project.creator }
   let_it_be(:other_user) { create(:user) }
 
+  let_it_be(:top_nav_partial) { 'layouts/header/_default' }
+
   let(:user) { creator }
   let(:branch) { '' }
 
@@ -233,6 +235,25 @@ RSpec.describe IdeController do
           end
         end
       end
+
+      # This indirectly tests that `minimal: true` was passed to the fullscreen layout
+      it 'does not render top nav' do
+        subject
+
+        expect(response).not_to render_template(top_nav_partial)
+      end
+
+      context 'without vscode_web_ide feature flag' do
+        before do
+          stub_feature_flags(vscode_web_ide: false)
+        end
+
+        it 'renders top nav' do
+          subject
+
+          expect(response).to render_template(top_nav_partial)
+        end
+      end
     end
   end
 end