Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 5 deletions

diff --git a/spec/lib/gitlab/import_export/shared_spec.rb b/spec/lib/gitlab/import_export/shared_spec.rb
index da2c96dcf51..62669836973 100644
--- a/spec/lib/gitlab/import_export/shared_spec.rb
+++ b/spec/lib/gitlab/import_export/shared_spec.rb
@@ -53,16 +53,17 @@ describe Gitlab::ImportExport::Shared do
       subject.error(error)
     end
 
-    it 'calls the error logger with the full message' do
-      expect(subject).to receive(:log_error).with(hash_including(message: error.message))
+    it 'calls the error logger without a backtrace' do
+      expect(subject).to receive(:log_error).with(message: error.message)
 
       subject.error(error)
     end
 
-    it 'calls the debug logger with a backtrace' do
-      error.set_backtrace('backtrace')
+    it 'calls the error logger with the full message' do
+      backtrace = caller
+      allow(error).to receive(:backtrace).and_return(caller)
 
-      expect(subject).to receive(:log_debug).with(hash_including(backtrace: 'backtrace'))
+      expect(subject).to receive(:log_error).with(message: error.message, error_backtrace: Gitlab::Profiler.clean_backtrace(backtrace))
 
       subject.error(error)
     end
diff --git a/spec/support/helpers/migrations_helpers.rb b/spec/support/helpers/migrations_helpers.rb
index 176788d0506..68f71494771 100644
--- a/spec/support/helpers/migrations_helpers.rb
+++ b/spec/support/helpers/migrations_helpers.rb
@@ -132,6 +132,41 @@ module MigrationsHelpers
       migration.name == described_class.name
     end
   end
+
+  class ReversibleMigrationTest
+    attr_reader :before_up, :after_up
+
+    def initialize
+      @before_up = -> {}
+      @after_up = -> {}
+    end
+
+    def before(expectations)
+      @before_up = expectations
+
+      self
+    end
+
+    def after(expectations)
+      @after_up = expectations
+
+      self
+    end
+  end
+
+  def reversible_migration(&block)
+    tests = yield(ReversibleMigrationTest.new)
+
+    tests.before_up.call
+
+    migrate!
+
+    tests.after_up.call
+
+    schema_migrate_down!
+
+    tests.before_up.call
+  end
 end
 
 MigrationsHelpers.prepend_if_ee('EE::MigrationsHelpers')