Merge branch 'master' of http://github.com/rails/rails

1 files changed, 30 insertions, 0 deletions

diff --git a/activemodel/test/cases/mass_assignment_security/permission_set_test.rb b/activemodel/test/cases/mass_assignment_security/permission_set_test.rb
new file mode 100644
index 0000000000..d005b638e4
--- /dev/null
+++ b/activemodel/test/cases/mass_assignment_security/permission_set_test.rb
@@ -0,0 +1,30 @@
+require "cases/helper"
+
+class PermissionSetTest < ActiveModel::TestCase
+
+  def setup
+    @permission_list = ActiveModel::MassAssignmentSecurity::PermissionSet.new
+  end
+
+  test "+ stringifies added collection values" do
+    symbol_collection = [ :admin ]
+    new_list = @permission_list += symbol_collection
+
+    assert new_list.include?('admin'), "did not add collection to #{@permission_list.inspect}}"
+  end
+
+  test "include? normalizes multi-parameter keys" do
+    multi_param_key = 'admin(1)'
+    new_list = @permission_list += [ 'admin' ]
+
+    assert new_list.include?(multi_param_key), "#{multi_param_key} not found in #{@permission_list.inspect}"
+  end
+
+  test "include? normal keys" do
+    normal_key = 'admin'
+    new_list = @permission_list +=  [ normal_key ]
+
+    assert new_list.include?(normal_key), "#{normal_key} not found in #{@permission_list.inspect}"
+  end
+
+end