Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 1 deletions

diff --git a/spec/lib/gitlab/database/transaction/context_spec.rb b/spec/lib/gitlab/database/transaction/context_spec.rb
index 3c2c5649784..37cfc841d48 100644
--- a/spec/lib/gitlab/database/transaction/context_spec.rb
+++ b/spec/lib/gitlab/database/transaction/context_spec.rb
@@ -62,6 +62,26 @@ RSpec.describe Gitlab::Database::Transaction::Context do
     it { expect(data[:queries]).to eq(['SELECT 1', 'SELECT * FROM users']) }
   end
 
+  describe '#track_backtrace' do
+    before do
+      subject.track_backtrace(caller)
+    end
+
+    it { expect(data[:backtraces]).to be_a(Array) }
+    it { expect(data[:backtraces]).to all(be_a(Array)) }
+    it { expect(data[:backtraces].length).to eq(1) }
+    it { expect(data[:backtraces][0][0]).to be_a(String) }
+
+    it 'appends the backtrace' do
+      subject.track_backtrace(caller)
+
+      expect(data[:backtraces].length).to eq(2)
+      expect(subject.backtraces).to be_a(Array)
+      expect(subject.backtraces).to all(be_a(Array))
+      expect(subject.backtraces[1][0]).to be_a(String)
+    end
+  end
+
   describe '#duration' do
     before do
       subject.set_start_time
diff --git a/spec/lib/gitlab/database/transaction/observer_spec.rb b/spec/lib/gitlab/database/transaction/observer_spec.rb
index 7aa24217dc3..e5cc0106c9b 100644
--- a/spec/lib/gitlab/database/transaction/observer_spec.rb
+++ b/spec/lib/gitlab/database/transaction/observer_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Gitlab::Database::Transaction::Observer do
           User.first
 
           expect(transaction_context).to be_a(::Gitlab::Database::Transaction::Context)
-          expect(context.keys).to match_array(%i(start_time depth savepoints queries))
+          expect(context.keys).to match_array(%i(start_time depth savepoints queries backtraces))
           expect(context[:depth]).to eq(2)
           expect(context[:savepoints]).to eq(1)
           expect(context[:queries].length).to eq(1)
@@ -35,6 +35,7 @@ RSpec.describe Gitlab::Database::Transaction::Observer do
       expect(context[:depth]).to eq(2)
       expect(context[:savepoints]).to eq(1)
       expect(context[:releases]).to eq(1)
+      expect(context[:backtraces].length).to eq(1)
     end
 
     describe '.extract_sql_command' do