Fix bad test order dependency between test/cases/validations/i18n_gen…

…erate_message_validation_test.rb and test/cases/validations/uniqueness_validation_test.rb
rails · Nov 16, 2013 · 8552791 · 8552791
1 parent d5dbc03
commit 8552791
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -55,22 +55,30 @@ def test_generate_message_taken_with_custom_message
   end
 
   test "translation for 'taken' can be overridden" do
-    I18n.backend.store_translations "en", {errors: {attributes: {title: {taken: "Custom taken message" }}}}
+    reset_i18n_load_path do
-    assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+      I18n.backend.store_translations "en", {errors: {attributes: {title: {taken: "Custom taken message" }}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
   end
 
   test "translation for 'taken' can be overridden in activerecord scope" do
-    I18n.backend.store_translations "en", {activerecord: {errors: {messages: {taken: "Custom taken message" }}}}
+    reset_i18n_load_path do
-    assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+      I18n.backend.store_translations "en", {activerecord: {errors: {messages: {taken: "Custom taken message" }}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
   end
 
   test "translation for 'taken' can be overridden in activerecord model scope" do
-    I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {taken: "Custom taken message" }}}}}
+    reset_i18n_load_path do
-    assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+      I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {taken: "Custom taken message" }}}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
   end
 
   test "translation for 'taken' can be overridden in activerecord attributes scope" do
-    I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {attributes: {title: {taken: "Custom taken message" }}}}}}}
+    reset_i18n_load_path do
-    assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+      I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {attributes: {title: {taken: "Custom taken message" }}}}}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
   end
 end