From 85f7d955f31209605cccd4cca64be93eec9782f1 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Thu, 23 Jul 2015 06:49:03 -0700
Subject: Update and fix forbidden attributes tests Add AC::Parameters tests
 for WhereChain#not

---
 .../test/cases/attribute_assignment_test.rb        | 25 +++++++++++++++++++---
 .../cases/forbidden_attributes_protection_test.rb  | 10 +++++++--
 2 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/attribute_assignment_test.rb b/activemodel/test/cases/attribute_assignment_test.rb
index 3336691841..12e007292a 100644
--- a/activemodel/test/cases/attribute_assignment_test.rb
+++ b/activemodel/test/cases/attribute_assignment_test.rb
@@ -23,13 +23,32 @@ class AttributeAssignmentTest < ActiveModel::TestCase
   class ErrorFromAttributeWriter < StandardError
   end
 
-  class ProtectedParams < ActiveSupport::HashWithIndifferentAccess
+  class ProtectedParams
+    attr_accessor :permitted
+    alias :permitted? :permitted
+
+    delegate :keys, :key?, :has_key?, :empty?, to: :@parameters
+
+    def initialize(attributes)
+      @parameters = attributes.with_indifferent_access
+      @permitted = false
+    end
+
     def permit!
       @permitted = true
+      self
+    end
+
+    def [](key)
+      @parameters[key]
+    end
+
+    def to_h
+      @parameters
     end
 
-    def permitted?
-      @permitted ||= false
+    def stringify_keys
+      dup
     end
 
     def dup
diff --git a/activemodel/test/cases/forbidden_attributes_protection_test.rb b/activemodel/test/cases/forbidden_attributes_protection_test.rb
index 3cb204a2c5..d8d757f52a 100644
--- a/activemodel/test/cases/forbidden_attributes_protection_test.rb
+++ b/activemodel/test/cases/forbidden_attributes_protection_test.rb
@@ -2,12 +2,14 @@ require 'cases/helper'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'models/account'
 
-class ProtectedParams < ActiveSupport::HashWithIndifferentAccess
+class ProtectedParams
   attr_accessor :permitted
   alias :permitted? :permitted
 
+  delegate :keys, :key?, :has_key?, :empty?, to: :@parameters
+
   def initialize(attributes)
-    super(attributes)
+    @parameters = attributes
     @permitted = false
   end
 
@@ -15,6 +17,10 @@ class ProtectedParams < ActiveSupport::HashWithIndifferentAccess
     @permitted = true
     self
   end
+
+  def to_h
+    @parameters
+  end
 end
 
 class ActiveModelMassUpdateProtectionTest < ActiveSupport::TestCase
-- 
cgit v1.2.3