From d22e522179c1c90e658c3ed0e9b972ec62306209 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 6 Aug 2016 19:37:57 +0200
Subject: modernizes hash syntax in activerecord

---
 .../test/cases/validations/i18n_validation_test.rb | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'activerecord/test/cases/validations/i18n_validation_test.rb')

diff --git a/activerecord/test/cases/validations/i18n_validation_test.rb b/activerecord/test/cases/validations/i18n_validation_test.rb
index 52a00c55e7..61289cd299 100644
--- a/activerecord/test/cases/validations/i18n_validation_test.rb
+++ b/activerecord/test/cases/validations/i18n_validation_test.rb
@@ -12,7 +12,7 @@ class I18nValidationTest < ActiveRecord::TestCase
     @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
     I18n.load_path.clear
     I18n.backend = I18n::Backend::Simple.new
-    I18n.backend.store_translations("en", :errors => {:messages => {:custom => nil}})
+    I18n.backend.store_translations("en", errors: {messages: {custom: nil}})
   end
 
   teardown do
@@ -21,12 +21,12 @@ class I18nValidationTest < ActiveRecord::TestCase
   end
 
   def unique_topic
-    @unique ||= Topic.create :title => "unique!"
+    @unique ||= Topic.create title: "unique!"
   end
 
   def replied_topic
     @replied_topic ||= begin
-      topic = Topic.create(:title => "topic")
+      topic = Topic.create(title: "topic")
       topic.replies << Reply.new
       topic
     end
@@ -38,10 +38,10 @@ class I18nValidationTest < ActiveRecord::TestCase
   COMMON_CASES = [
   # [ case,                                validation_options,            generate_message_options]
     [ "given no options",                  {},                            {}],
-    [ "given custom message",              {:message => "custom"},        {:message => "custom"}],
-    [ "given if condition",                {:if     => lambda { true }},  {}],
-    [ "given unless condition",            {:unless => lambda { false }}, {}],
-    [ "given option that is not reserved", {:format => "jpg"},            {:format => "jpg" }],
+    [ "given custom message",              {message: "custom"},        {message: "custom"}],
+    [ "given if condition",                {if: lambda { true }},  {}],
+    [ "given unless condition",            {unless: lambda { false }}, {}],
+    [ "given option that is not reserved", {format: "jpg"},            {format: "jpg" }],
     [ "given on condition",                {on: [:create, :update] },     {}]
   ]
 
@@ -49,7 +49,7 @@ class I18nValidationTest < ActiveRecord::TestCase
     test "validates_uniqueness_of on generated message #{name}" do
       Topic.validates_uniqueness_of :title, validation_options
       @topic.title = unique_topic.title
-      assert_called_with(@topic.errors, :generate_message, [:title, :taken, generate_message_options.merge(:value => "unique!")]) do
+      assert_called_with(@topic.errors, :generate_message, [:title, :taken, generate_message_options.merge(value: "unique!")]) do
         @topic.valid?
       end
     end
@@ -58,15 +58,15 @@ class I18nValidationTest < ActiveRecord::TestCase
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_associated on generated message #{name}" do
       Topic.validates_associated :replies, validation_options
-      assert_called_with(replied_topic.errors, :generate_message, [:replies, :invalid, generate_message_options.merge(:value => replied_topic.replies)]) do
+      assert_called_with(replied_topic.errors, :generate_message, [:replies, :invalid, generate_message_options.merge(value: replied_topic.replies)]) do
         replied_topic.save
       end
     end
   end
 
   def test_validates_associated_finds_custom_model_key_translation
-    I18n.backend.store_translations "en", :activerecord => {:errors => {:models => {:topic => {:attributes => {:replies => {:invalid => "custom message"}}}}}}
-    I18n.backend.store_translations "en", :activerecord => {:errors => {:messages => {:invalid => "global message"}}}
+    I18n.backend.store_translations "en", activerecord: {errors: {models: {topic: {attributes: {replies: {invalid: "custom message"}}}}}}
+    I18n.backend.store_translations "en", activerecord: {errors: {messages: {invalid: "global message"}}}
 
     Topic.validates_associated :replies
     replied_topic.valid?
@@ -74,7 +74,7 @@ class I18nValidationTest < ActiveRecord::TestCase
   end
 
   def test_validates_associated_finds_global_default_translation
-    I18n.backend.store_translations "en", :activerecord => {:errors => {:messages => {:invalid => "global message"}}}
+    I18n.backend.store_translations "en", activerecord: {errors: {messages: {invalid: "global message"}}}
 
     Topic.validates_associated :replies
     replied_topic.valid?
-- 
cgit v1.2.3