1 files changed, 25 insertions, 22 deletions
diff --git a/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb b/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb
index 8450396284a..fc723138d88 100644
--- a/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb
+++ b/spec/lib/gitlab/graphql/query_analyzers/logger_analyzer_spec.rb
@@ -3,43 +3,46 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Graphql::QueryAnalyzers::LoggerAnalyzer do
-  subject { described_class.new }
-
-  describe '#initial_value' do
-    it 'filters out sensitive variables' do
-      doc = GraphQL.parse <<-GRAPHQL
-        mutation createNote($body: String!) {
-          createNote(input: {noteableId: "1", body: $body}) {
-            note {
-              id
-            }
+  let(:initial_value) { analyzer.initial_value(query) }
+  let(:analyzer) { described_class.new }
+  let(:query) { GraphQL::Query.new(GitlabSchema, document: document, context: {}, variables: { body: "some note" }) }
+  let(:document) do
+    GraphQL.parse <<-GRAPHQL
+      mutation createNote($body: String!) {
+        createNote(input: {noteableId: "1", body: $body}) {
+          note {
+            id
           }
         }
-      GRAPHQL
+      }
+    GRAPHQL
+  end
 
-      query = GraphQL::Query.new(GitlabSchema, document: doc, context: {}, variables: { body: "some note" })
+  describe 'variables' do
+    subject { initial_value.fetch(:variables) }
 
-      expect(subject.initial_value(query)[:variables]).to eq('{:body=>"[FILTERED]"}')
-    end
+    it { is_expected.to eq('{:body=>"[FILTERED]"}') }
   end
 
   describe '#final_value' do
     let(:monotonic_time_before) { 42 }
     let(:monotonic_time_after) { 500 }
     let(:monotonic_time_duration) { monotonic_time_after - monotonic_time_before }
+    let(:memo) { initial_value }
+
+    subject(:final_value) { analyzer.final_value(memo) }
+
+    before do
+      RequestStore.store[:graphql_logs] = nil
 
-    it 'returns a duration in seconds' do
       allow(GraphQL::Analysis).to receive(:analyze_query).and_return([4, 2, [[], []]])
       allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(monotonic_time_before, monotonic_time_after)
       allow(Gitlab::GraphqlLogger).to receive(:info)
+    end
 
-      expected_duration = monotonic_time_duration
-      memo = subject.initial_value(spy('query'))
-
-      subject.final_value(memo)
-
-      expect(memo).to have_key(:duration_s)
-      expect(memo[:duration_s]).to eq(expected_duration)
+    it 'inserts duration in seconds to memo and sets request store' do
+      expect { final_value }.to change { memo[:duration_s] }.to(monotonic_time_duration)
+                            .and change { RequestStore.store[:graphql_logs] }.to([memo])
     end
   end
 end