From 2b6cd16637ddfe099db157d3e02dd34e41ef9b5d Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Mon, 23 Oct 2017 03:03:47 +0900 Subject: Place `MocktailDesigner` in `test/models/drink_designer.rb` Since `MocktailDesigner` inherits `DrinkDesigner` and can not be used alone. --- activerecord/test/cases/reflection_test.rb | 1 - activerecord/test/models/drink_designer.rb | 3 +++ activerecord/test/models/mocktail_designer.rb | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 activerecord/test/models/mocktail_designer.rb (limited to 'activerecord') diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb index de1d244d65..0c522b8817 100644 --- a/activerecord/test/cases/reflection_test.rb +++ b/activerecord/test/cases/reflection_test.rb @@ -25,7 +25,6 @@ require "models/chef" require "models/department" require "models/cake_designer" require "models/drink_designer" -require "models/mocktail_designer" require "models/recipe" class ReflectionTest < ActiveRecord::TestCase diff --git a/activerecord/test/models/drink_designer.rb b/activerecord/test/models/drink_designer.rb index 1c407844c5..eb6701b84e 100644 --- a/activerecord/test/models/drink_designer.rb +++ b/activerecord/test/models/drink_designer.rb @@ -3,3 +3,6 @@ class DrinkDesigner < ActiveRecord::Base has_one :chef, as: :employable end + +class MocktailDesigner < DrinkDesigner +end diff --git a/activerecord/test/models/mocktail_designer.rb b/activerecord/test/models/mocktail_designer.rb deleted file mode 100644 index 123ff4fb3d..0000000000 --- a/activerecord/test/models/mocktail_designer.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -class MocktailDesigner < DrinkDesigner -end -- cgit v1.2.3