2 files changed, 34 insertions, 1 deletions
diff --git a/spec/support/matchers/gitaly_matchers.rb b/spec/support/matchers/gitaly_matchers.rb
index d7a53820684..65dbc01f6e4 100644
--- a/spec/support/matchers/gitaly_matchers.rb
+++ b/spec/support/matchers/gitaly_matchers.rb
@@ -1,3 +1,3 @@
-RSpec::Matchers.define :post_receive_request_with_repo_path do |path|
+RSpec::Matchers.define :gitaly_request_with_repo_path do |path|
   match { |actual| actual.repository.path == path }
 end
diff --git a/spec/support/matchers/query_matcher.rb b/spec/support/matchers/query_matcher.rb
new file mode 100644
index 00000000000..ac8c4ab91d9
--- /dev/null
+++ b/spec/support/matchers/query_matcher.rb
@@ -0,0 +1,33 @@
+RSpec::Matchers.define :make_queries_matching do |matcher, expected_count = nil|
+  supports_block_expectations
+
+  match do |block|
+    @counter = query_count(matcher, &block)
+    if expected_count
+      @counter.count == expected_count
+    else
+      @counter.count > 0
+    end
+  end
+
+  failure_message_when_negated do |_|
+    if expected_count
+      "expected #{matcher} not to match #{expected_count} queries, got #{@counter.count} matches:\n\n#{@counter.inspect}"
+    else
+      "expected #{matcher} not to match any query, got #{@counter.count} matches:\n\n#{@counter.inspect}"
+    end
+  end
+
+  failure_message do |_|
+    if expected_count
+      "expected #{matcher} to match #{expected_count} queries, got #{@counter.count} matches:\n\n#{@counter.inspect}"
+    else
+      "expected #{matcher} to match at least one query, got #{@counter.count} matches:\n\n#{@counter.inspect}"
+    end
+  end
+
+  def query_count(regex, &block)
+    @recorder = ActiveRecord::QueryRecorder.new(&block).log
+    @recorder.select{ |q| q.match(regex) }
+  end
+end