Refactor of active_model/naming.rb and allow collection and element to be writable

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

1 files changed, 30 insertions, 0 deletions

diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index dc39b84ed8..3918002360 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -18,6 +18,26 @@ class NamingTest < ActiveModel::TestCase
     assert_equal 'track_back', @model_name.element
   end
 
+  def test_set_element
+    @model_name.element = 'foo'
+
+    assert_equal 'foo', @model_name.element
+    assert_equal 'Foo', @model_name.human
+    assert_equal 'post/foos', @model_name.collection
+    assert_equal 'post/foos/foo', @model_name.partial_path
+  end
+
+  def test_human
+    assert_equal 'Track back', @model_name.human
+  end
+
+  def test_set_collection
+    @model_name.collection = 'foo'
+
+    assert_equal 'foo', @model_name.collection
+    assert_equal 'foo/track_back', @model_name.partial_path
+  end
+
   def test_collection
     assert_equal 'post/track_backs', @model_name.collection
   end
@@ -25,4 +45,14 @@ class NamingTest < ActiveModel::TestCase
   def test_partial_path
     assert_equal 'post/track_backs/track_back', @model_name.partial_path
   end
+
+  def test_should_preserve_custom_collection
+    @model_name.collection = 'bar'
+    @model_name.element = 'foo'
+
+    assert_equal 'foo', @model_name.element
+    assert_equal 'Foo', @model_name.human
+    assert_equal 'bar', @model_name.collection
+    assert_equal 'bar/foo', @model_name.partial_path
+  end
 end