diff options
| -rw-r--r-- | activerecord/lib/active_record/dynamic_matchers.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/zeitwerk.rake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/dynamic_matchers.rb b/activerecord/lib/active_record/dynamic_matchers.rb index 2c941b0008..398a029068 100644 --- a/activerecord/lib/active_record/dynamic_matchers.rb +++ b/activerecord/lib/active_record/dynamic_matchers.rb @@ -49,9 +49,9 @@ module ActiveRecord attr_reader :model, :name, :attribute_names - def initialize(model, name) + def initialize(model, method_name) @model = model - @name = name.to_s + @name = method_name.to_s @attribute_names = @name.match(self.class.pattern)[1].split("_and_") @attribute_names.map! { |name| @model.attribute_aliases[name] || name } end diff --git a/railties/lib/rails/tasks/zeitwerk.rake b/railties/lib/rails/tasks/zeitwerk.rake index cf84bb6948..b7f5cd154b 100644 --- a/railties/lib/rails/tasks/zeitwerk.rake +++ b/railties/lib/rails/tasks/zeitwerk.rake @@ -20,7 +20,7 @@ end mismatches = [] check_directory = ->(directory, parent) do # test/mailers/previews might not exist. - return unless File.exists?(directory) + return unless File.exist?(directory) Dir.foreach(directory) do |entry| next if entry.start_with?(".") |