Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
index fd3b71deb37..e2bf87bf29f 100644
--- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
@@ -674,10 +674,12 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
         end
 
         it 'does not allow setting params that are excluded from import_export settings' do
-          project.create_import_data(data: { override_params: { lfs_enabled: true } })
+          original_value = project.lfs_enabled?
+
+          project.create_import_data(data: { override_params: { lfs_enabled: !original_value } })
 
           expect(restored_project_json).to eq(true)
-          expect(project.lfs_enabled).to be_falsey
+          expect(project.lfs_enabled).to eq(original_value)
         end
 
         it 'overrides project feature access levels' do