Fixing my code to work properly :)

Author: fuzzyrichie

lib/ar_query_matchers.rb

@@ -349,7 +349,7 @@ def reject_record(subset, expected, key)
         end
       end
 
-      def filter_model_names(expected, subset, values_only)
+      def filter_model_names(subset, values_only)
         all_model_names = expected.keys + @query_stats.queries.keys
         if values_only
           all_model_names.reject { |key| reject_record(subset, expected, key) }.uniq
@@ -359,10 +359,9 @@ def filter_model_names(expected, subset, values_only)
       end
 
       def expectation_failed_message(crud_operation, values_only: false, subset: false)
-        if values_only
-          expected = expected.transform_values { |v| v.is_a(Array) ? v : [v] }
-        end
-        model_names_with_wrong_count = filter_model_names(expected, subset, values_only)
+        expected.transform_values { |v| v.is_a(Array) ? v : [v] } if values_only
+
+        model_names_with_wrong_count = filter_model_names(subset, values_only)
         "Expected ActiveRecord to #{crud_operation} #{expected}, got #{values_only ? @query_stats.query_values : @query_stats.query_counts}\n"\
           "Expectations that differed:\n#{difference(model_names_with_wrong_count, values_only: values_only).join("\n")}\n\nWhere unexpected queries came from:\n\n#{source_lines(model_names_with_wrong_count).join("\n")}"
       end

lib/ar_query_matchers/queries/load_counter.rb

@@ -27,7 +27,7 @@ def filter_map(name, sql)
           # First check for a `SELECT * FROM` query that ActiveRecord has
           # helpfully named for us in the payload
           match = name.match(MODEL_LOAD_PATTERN)
-          return ModelName.new(match[:model_name]) if match
+          return ModelName.new(match[:model_name]) if match and match.names.include? :model_name
 
           # Fall back to pattern-matching on the table name in a COUNT and looking
           # up the table name from ActiveRecord's loaded descendants.

lib/ar_query_matchers/queries/query_counter.rb

@@ -82,7 +82,7 @@ def instrument(&block)
       MARGINALIA_SQL_COMMENT_PATTERN = %r{/*line:(?<line>.*)'*/}
       private_constant :MARGINALIA_SQL_COMMENT_PATTERN
 
-      def add_to_query(queries, payload, model_obj, finish, start)
+      def add_to_query(queries, model_name, payload, model_obj, finish, start)
         comment = payload[:sql].match(MARGINALIA_SQL_COMMENT_PATTERN)
         queries[model_name][:lines] << comment[:line] if comment
         queries[model_name][:count] += 1
@@ -100,7 +100,7 @@ def to_proc(queries)
           model_obj = @query_filter.filter_map(payload[:name] || '', payload[:sql] || '')
           model_name = model_obj&.model_name
 
-          add_to_query(queries, payload, model_obj, finish, start) if model_name
+          add_to_query(queries, model_name, payload, model_obj, finish, start) if model_name
         end
       end
     end