From a39d08d2ad563acdd6b56b84c341997de87a25b5 Mon Sep 17 00:00:00 2001
From: Gauthier Delacroix <gauthier.delacroix@gmail.com>
Date: Wed, 8 Oct 2014 16:51:44 +0200
Subject: [PATCH] Cleaner unsuffixed association keys tests

---
 test/fixtures/poro.rb                         | 22 +++++++++++++++++++
 .../active_model/serializer/has_many_test.rb  |  8 -------
 .../active_model/serializer/has_one_test.rb   |  8 -------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/test/fixtures/poro.rb b/test/fixtures/poro.rb
index 14fa3e5a..50bb1795 100644
--- a/test/fixtures/poro.rb
+++ b/test/fixtures/poro.rb
@@ -142,3 +142,25 @@ module TestNamespace
   class ProfileSerializer < ::ProfileSerializer; end
   class UserSerializer    < ::UserSerializer;    end
 end
+
+ActiveModel::Serializer.setup do |config|
+  config.default_key_type = :name
+end
+
+class NameKeyUserSerializer < ActiveModel::Serializer
+  attributes :name, :email
+
+  has_one :profile
+end
+
+class NameKeyPostSerializer < ActiveModel::Serializer
+  attributes :title, :body
+  
+  has_many :comments
+end
+
+ActiveModel::Serializer.setup do |config|
+  config.default_key_type = nil
+end
+
+
diff --git a/test/unit/active_model/serializer/has_many_test.rb b/test/unit/active_model/serializer/has_many_test.rb
index d1bb83ad..f8b2c738 100644
--- a/test/unit/active_model/serializer/has_many_test.rb
+++ b/test/unit/active_model/serializer/has_many_test.rb
@@ -243,14 +243,6 @@ module ActiveModel
         }, @post_serializer.as_json)
       end
 
-      CONFIG.default_key_type = :name
-      class NameKeyPostSerializer < ActiveModel::Serializer
-        attributes :title, :body
-        
-        has_many :comments
-      end
-      CONFIG.default_key_type = nil
-
       def test_associations_name_key_embedding_ids_serialization_using_serializable_hash
         @association = NameKeyPostSerializer._associations[:comments]
         @association.embed = :ids
diff --git a/test/unit/active_model/serializer/has_one_test.rb b/test/unit/active_model/serializer/has_one_test.rb
index 521c16d5..9f7e393c 100644
--- a/test/unit/active_model/serializer/has_one_test.rb
+++ b/test/unit/active_model/serializer/has_one_test.rb
@@ -217,14 +217,6 @@ module ActiveModel
         }, @user_serializer.as_json)
       end
 
-      CONFIG.default_key_type = :name
-      class NameKeyUserSerializer < ActiveModel::Serializer
-        attributes :name, :email
-
-        has_one :profile
-      end
-      CONFIG.default_key_type = nil
-
       def test_associations_name_key_embedding_ids_serialization_using_serializable_hash
         @association = NameKeyUserSerializer._associations[:profile]
         @association.embed = :ids