fix merge conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/lib/gitlab/import_export/import_export_reader_spec.rb b/spec/lib/gitlab/import_export/import_export_reader_spec.rb
index 2fc9a39c68b..c4d03fecd54 100644
--- a/spec/lib/gitlab/import_export/import_export_reader_spec.rb
+++ b/spec/lib/gitlab/import_export/import_export_reader_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::ImportExport::ImportExportReader do
+describe Gitlab::ImportExport::ImportExportReader, lib: true  do
   let(:shared) { Gitlab::ImportExport::Shared.new(relative_path:'') }
   let(:test_config) { 'spec/support/import_export/import_export.yml' }
   let(:project_tree_hash) do
@@ -16,7 +16,7 @@ describe Gitlab::ImportExport::ImportExportReader do
     }
   end
 
-  it 'should generate hash from project tree config' do
-    expect(described_class.new(config: test_config, shared: shared).project_tree) =~ (project_tree_hash)
+  it 'generates hash from project tree config' do
+    expect(described_class.new(config: test_config, shared: shared).project_tree).to match(project_tree_hash)
   end
 end