提交 3a4c488a 编写于 作者: M Matthew Draper 提交者: GitHub

Merge pull request #29141 from kamipo/make_helper_methods_to_private

Make helper methods in tests to private
......@@ -64,10 +64,6 @@ def test_preload_sti_middle_relation
club1.members.sort_by(&:id)
end
def make_model(name)
Class.new(ActiveRecord::Base) { define_singleton_method(:name) { name } }
end
def test_ordered_has_many_through
person_prime = Class.new(ActiveRecord::Base) do
def self.name; "Person"; end
......@@ -152,20 +148,6 @@ def test_no_pk_join_model_callbacks
assert after_destroy_called, "after destroy should be called"
end
def make_no_pk_hm_t
lesson = make_model "Lesson"
student = make_model "Student"
lesson_student = make_model "LessonStudent"
lesson_student.table_name = "lessons_students"
lesson_student.belongs_to :lesson, anonymous_class: lesson
lesson_student.belongs_to :student, anonymous_class: student
lesson.has_many :lesson_students, anonymous_class: lesson_student
lesson.has_many :students, through: :lesson_students, anonymous_class: student
[lesson, lesson_student, student]
end
def test_pk_is_not_required_for_join
post = Post.includes(:scategories).first
post2 = Post.includes(:categories).first
......@@ -1252,4 +1234,23 @@ def test_incorrectly_ordered_through_associations
)
end
end
private
def make_model(name)
Class.new(ActiveRecord::Base) { define_singleton_method(:name) { name } }
end
def make_no_pk_hm_t
lesson = make_model "Lesson"
student = make_model "Student"
lesson_student = make_model "LessonStudent"
lesson_student.table_name = "lessons_students"
lesson_student.belongs_to :lesson, anonymous_class: lesson
lesson_student.belongs_to :student, anonymous_class: student
lesson.has_many :lesson_students, anonymous_class: lesson_student
lesson.has_many :students, through: :lesson_students, anonymous_class: student
[lesson, lesson_student, student]
end
end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册