diff options
author | Sean McGivern <sean@gitlab.com> | 2019-08-01 09:42:28 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-08-01 09:42:28 +0000 |
commit | 3186a3bfe31455ab0f0228aac3cc94ef2467f933 (patch) | |
tree | 9c4053f91fbd60400964b3f26936669c6f5c695a /spec/lib | |
parent | 011093ce68f672c77735026a18dd96a9e2f8f106 (diff) | |
parent | 7a5c4cd0ca692e2fac0d648726b71dcd304602ec (diff) | |
download | gitlab-ce-3186a3bfe31455ab0f0228aac3cc94ef2467f933.tar.gz |
Merge branch 'sh-fix-infite-loop-peek-bar' into 'master'
Fix SystemStackError when Peek bar is active with Rugged calls
Closes #65404
See merge request gitlab-org/gitlab-ce!31357
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/peek/views/rugged_spec.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/lib/peek/views/rugged_spec.rb b/spec/lib/peek/views/rugged_spec.rb index 8bf996fc6bc..d07d6b51a1f 100644 --- a/spec/lib/peek/views/rugged_spec.rb +++ b/spec/lib/peek/views/rugged_spec.rb @@ -24,7 +24,7 @@ describe Peek::Views::Rugged, :request_store do args: [project.repository.raw, 'HEAD'], duration: 0.123) ::Gitlab::RuggedInstrumentation.add_call_details(feature: :rugged_test2, - args: [project.repository.raw, 'refs/heads/master'], + args: [project.repository, 'refs/heads/master'], duration: 0.456) results = subject.results @@ -32,7 +32,11 @@ describe Peek::Views::Rugged, :request_store do expect(results[:duration]).to eq('1234.00ms') expect(results[:details].count).to eq(2) - expect(results[:details][0][:args]).to eq([project.repository.raw.to_s, "refs/heads/master"]) - expect(results[:details][1][:args]).to eq([project.repository.raw.to_s, "HEAD"]) + expected = [ + [project.repository.raw.to_s, "HEAD"], + [project.repository.to_s, "refs/heads/master"] + ] + + expect(results[:details].map { |data| data[:args] }).to match_array(expected) end end |