Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/serializers/diffs_entity_spec.rb b/spec/serializers/diffs_entity_spec.rb
index 482f9e76c62..435d8a6aff2 100644
--- a/spec/serializers/diffs_entity_spec.rb
+++ b/spec/serializers/diffs_entity_spec.rb
@@ -68,5 +68,15 @@ describe DiffsEntity do
         end
       end
     end
+
+    context 'when code_navigation feature flag is disabled' do
+      it 'does not include code navigation properties' do
+        stub_feature_flags(code_navigation: false)
+
+        expect(Gitlab::CodeNavigationPath).not_to receive(:new)
+
+        expect(subject).not_to include(:definition_path_prefix)
+      end
+    end
   end
 end