mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Module#{attr,attr_accessor,attr_reader,attr_writer} become public since Ruby 2.5
https://bugs.ruby-lang.org/issues/14132
This commit is contained in:
parent
8034dde023
commit
d5699198a4
8 changed files with 12 additions and 12 deletions
|
@ -55,8 +55,8 @@ module ActiveModel
|
|||
attr_readers = attributes.reject { |name| klass.attribute_method?(name) }
|
||||
attr_writers = attributes.reject { |name| klass.attribute_method?("#{name}=") }
|
||||
klass.define_attribute_methods
|
||||
klass.send(:attr_reader, *attr_readers)
|
||||
klass.send(:attr_writer, *attr_writers)
|
||||
klass.attr_reader(*attr_readers)
|
||||
klass.attr_writer(*attr_writers)
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -19,11 +19,11 @@ module ActiveModel
|
|||
|
||||
private
|
||||
def setup!(klass)
|
||||
klass.send(:attr_reader, *attributes.map do |attribute|
|
||||
klass.attr_reader(*attributes.map do |attribute|
|
||||
:"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation")
|
||||
end.compact)
|
||||
|
||||
klass.send(:attr_writer, *attributes.map do |attribute|
|
||||
klass.attr_writer(*attributes.map do |attribute|
|
||||
:"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation=")
|
||||
end.compact)
|
||||
end
|
||||
|
|
|
@ -90,7 +90,7 @@ module ActiveModel
|
|||
# class MyValidator < ActiveModel::Validator
|
||||
# def initialize(options={})
|
||||
# super
|
||||
# options[:class].send :attr_accessor, :custom_attribute
|
||||
# options[:class].attr_accessor :custom_attribute
|
||||
# end
|
||||
# end
|
||||
class Validator
|
||||
|
|
|
@ -61,7 +61,7 @@ class AbsenceValidationTest < ActiveRecord::TestCase
|
|||
|
||||
def test_validates_absence_of_virtual_attribute_on_model
|
||||
repair_validations(Interest) do
|
||||
Interest.send(:attr_accessor, :token)
|
||||
Interest.attr_accessor(:token)
|
||||
Interest.validates_absence_of(:token)
|
||||
|
||||
interest = Interest.create!(topic: "Thought Leadering")
|
||||
|
|
|
@ -64,7 +64,7 @@ class LengthValidationTest < ActiveRecord::TestCase
|
|||
|
||||
def test_validates_length_of_virtual_attribute_on_model
|
||||
repair_validations(Pet) do
|
||||
Pet.send(:attr_accessor, :nickname)
|
||||
Pet.attr_accessor(:nickname)
|
||||
Pet.validates_length_of(:name, minimum: 1)
|
||||
Pet.validates_length_of(:nickname, minimum: 1)
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ class PresenceValidationTest < ActiveRecord::TestCase
|
|||
|
||||
def test_validates_presence_of_virtual_attribute_on_model
|
||||
repair_validations(Interest) do
|
||||
Interest.send(:attr_accessor, :abbreviation)
|
||||
Interest.attr_accessor(:abbreviation)
|
||||
Interest.validates_presence_of(:topic)
|
||||
Interest.validates_presence_of(:abbreviation)
|
||||
|
||||
|
|
|
@ -14,9 +14,9 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
|
|||
super
|
||||
|
||||
Kernel.silence_warnings do
|
||||
Thor::Base.shell.send(:attr_accessor, :always_force)
|
||||
Thor::Base.shell.attr_accessor :always_force
|
||||
@shell = Thor::Base.shell.new
|
||||
@shell.send(:always_force=, true)
|
||||
@shell.always_force = true
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -10,9 +10,9 @@ module SharedGeneratorTests
|
|||
Rails::Generators::AppGenerator.instance_variable_set("@desc", nil)
|
||||
|
||||
Kernel.silence_warnings do
|
||||
Thor::Base.shell.send(:attr_accessor, :always_force)
|
||||
Thor::Base.shell.attr_accessor :always_force
|
||||
@shell = Thor::Base.shell.new
|
||||
@shell.send(:always_force=, true)
|
||||
@shell.always_force = true
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue