1 files changed, 36 insertions, 24 deletions
diff --git a/railties/test/generators/generated_attribute_test.rb b/railties/test/generators/generated_attribute_test.rb
index ee7c009305..bf60d6bc22 100644
--- a/railties/test/generators/generated_attribute_test.rb
+++ b/railties/test/generators/generated_attribute_test.rb
@@ -1,5 +1,7 @@
-require 'generators/generators_test_helper'
-require 'rails/generators/generated_attribute'
+# frozen_string_literal: true
+
+require "generators/generators_test_helper"
+require "rails/generators/generated_attribute"
 
 class GeneratedAttributeTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
@@ -36,6 +38,16 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
     assert_field_type :boolean, :check_box
   end
 
+  def test_field_type_returns_rich_text_area
+    assert_field_type :rich_text, :rich_text_area
+  end
+
+  def test_field_type_returns_file_field
+    %w(attachment attachments).each do |attribute_type|
+      assert_field_type attribute_type, :file_field
+    end
+  end
+
   def test_field_type_with_unknown_type_returns_text_field
     %w(foo bar baz).each do |attribute_type|
       assert_field_type attribute_type, :text_field
@@ -51,7 +63,7 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
   end
 
   def test_default_value_is_decimal
-    assert_field_default_value :decimal, '9.99'
+    assert_field_default_value :decimal, "9.99"
   end
 
   def test_default_value_is_datetime
@@ -65,7 +77,7 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
   end
 
   def test_default_value_is_string
-    assert_field_default_value :string, 'MyString'
+    assert_field_default_value :string, "MyString"
   end
 
   def test_default_value_for_type
@@ -74,7 +86,7 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
   end
 
   def test_default_value_is_text
-    assert_field_default_value :text, 'MyText'
+    assert_field_default_value :text, "MyText"
   end
 
   def test_default_value_is_boolean
@@ -82,71 +94,71 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
   end
 
   def test_default_value_is_nil
-    %w(references belongs_to).each do |attribute_type|
+    %w(references belongs_to rich_text attachment attachments).each do |attribute_type|
       assert_field_default_value attribute_type, nil
     end
   end
 
   def test_default_value_is_empty_string
     %w(foo bar baz).each do |attribute_type|
-      assert_field_default_value attribute_type, ''
+      assert_field_default_value attribute_type, ""
     end
   end
 
   def test_human_name
     assert_equal(
-      'Full name',
-      create_generated_attribute(:string, 'full_name').human_name
+      "Full name",
+      create_generated_attribute(:string, "full_name").human_name
     )
   end
 
   def test_reference_is_true
     %w(references belongs_to).each do |attribute_type|
-      assert create_generated_attribute(attribute_type).reference?
+      assert_predicate create_generated_attribute(attribute_type), :reference?
     end
   end
 
   def test_reference_is_false
     %w(foo bar baz).each do |attribute_type|
-      assert !create_generated_attribute(attribute_type).reference?
+      assert_not_predicate create_generated_attribute(attribute_type), :reference?
     end
   end
 
   def test_polymorphic_reference_is_true
     %w(references belongs_to).each do |attribute_type|
-      assert create_generated_attribute("#{attribute_type}{polymorphic}").polymorphic?
+      assert_predicate create_generated_attribute("#{attribute_type}{polymorphic}"), :polymorphic?
     end
   end
 
   def test_polymorphic_reference_is_false
     %w(foo bar baz).each do |attribute_type|
-      assert !create_generated_attribute("#{attribute_type}{polymorphic}").polymorphic?
+      assert_not_predicate create_generated_attribute("#{attribute_type}{polymorphic}"), :polymorphic?
     end
   end
 
   def test_blank_type_defaults_to_string_raises_exception
-    assert_equal :string, create_generated_attribute(nil, 'title').type
-    assert_equal :string, create_generated_attribute("", 'title').type
+    assert_equal :string, create_generated_attribute(nil, "title").type
+    assert_equal :string, create_generated_attribute("", "title").type
   end
 
   def test_handles_index_names_for_references
-    assert_equal "post", create_generated_attribute('string', 'post').index_name
-    assert_equal "post_id", create_generated_attribute('references', 'post').index_name
-    assert_equal "post_id", create_generated_attribute('belongs_to', 'post').index_name
-    assert_equal ["post_id", "post_type"], create_generated_attribute('references{polymorphic}', 'post').index_name
+    assert_equal "post", create_generated_attribute("string", "post").index_name
+    assert_equal "post_id", create_generated_attribute("references", "post").index_name
+    assert_equal "post_id", create_generated_attribute("belongs_to", "post").index_name
+    assert_equal ["post_id", "post_type"], create_generated_attribute("references{polymorphic}", "post").index_name
   end
 
   def test_handles_column_names_for_references
-    assert_equal "post", create_generated_attribute('string', 'post').column_name
-    assert_equal "post_id", create_generated_attribute('references', 'post').column_name
-    assert_equal "post_id", create_generated_attribute('belongs_to', 'post').column_name
+    assert_equal "post", create_generated_attribute("string", "post").column_name
+    assert_equal "post_id", create_generated_attribute("references", "post").column_name
+    assert_equal "post_id", create_generated_attribute("belongs_to", "post").column_name
   end
 
   def test_parse_required_attribute_with_index
     att = Rails::Generators::GeneratedAttribute.parse("supplier:references{required}:index")
     assert_equal "supplier", att.name
     assert_equal :references, att.type
-    assert att.has_index?
-    assert att.required?
+    assert_predicate att, :has_index?
+    assert_predicate att, :required?
   end
 end