From 2f13d1047ff4cca2bda7382eae0a7ba002ac8adc Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Wed, 5 Sep 2012 17:04:20 -0500
Subject: [PATCH] Add Rakefile and fix tests

---
 Rakefile                                         | 10 ++++++++++
 test/mass_assignment_security/black_list_test.rb |  2 +-
 .../permission_set_test.rb                       |  2 +-
 test/mass_assignment_security/sanitizer_test.rb  |  2 +-
 test/mass_assignment_security/white_list_test.rb |  2 +-
 test/mass_assignment_security_test.rb            | 16 ++++++++--------
 test/models/mass_assignment_specific.rb          | 10 +++++-----
 7 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/Rakefile b/Rakefile
index 2995527..04cdda8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1 +1,11 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs = ["test"]
+  t.pattern = "test/**/*_test.rb"
+  t.ruby_opts = ['-w']
+end
+
+task :default => :test
diff --git a/test/mass_assignment_security/black_list_test.rb b/test/mass_assignment_security/black_list_test.rb
index 0ec7f87..c5ffd56 100644
--- a/test/mass_assignment_security/black_list_test.rb
+++ b/test/mass_assignment_security/black_list_test.rb
@@ -1,4 +1,4 @@
-require "cases/helper"
+require "test_helper"
 
 class BlackListTest < ActiveModel::TestCase
 
diff --git a/test/mass_assignment_security/permission_set_test.rb b/test/mass_assignment_security/permission_set_test.rb
index 8082c49..ec6b086 100644
--- a/test/mass_assignment_security/permission_set_test.rb
+++ b/test/mass_assignment_security/permission_set_test.rb
@@ -1,4 +1,4 @@
-require "cases/helper"
+require "test_helper"
 
 class PermissionSetTest < ActiveModel::TestCase
 
diff --git a/test/mass_assignment_security/sanitizer_test.rb b/test/mass_assignment_security/sanitizer_test.rb
index b141cec..5ac39a2 100644
--- a/test/mass_assignment_security/sanitizer_test.rb
+++ b/test/mass_assignment_security/sanitizer_test.rb
@@ -1,4 +1,4 @@
-require "cases/helper"
+require "test_helper"
 require 'active_support/logger'
 
 class SanitizerTest < ActiveModel::TestCase
diff --git a/test/mass_assignment_security/white_list_test.rb b/test/mass_assignment_security/white_list_test.rb
index 737b554..4a63612 100644
--- a/test/mass_assignment_security/white_list_test.rb
+++ b/test/mass_assignment_security/white_list_test.rb
@@ -1,4 +1,4 @@
-require "cases/helper"
+require "test_helper"
 
 class WhiteListTest < ActiveModel::TestCase
 
diff --git a/test/mass_assignment_security_test.rb b/test/mass_assignment_security_test.rb
index 31a167a..733b5f4 100644
--- a/test/mass_assignment_security_test.rb
+++ b/test/mass_assignment_security_test.rb
@@ -71,11 +71,11 @@ def test_attributes_protected_by_default
   end
 
   def test_mass_assignment_protection_inheritance
-    assert_blank LoosePerson.accessible_attributes
-    assert_equal Set.new(['credit_rating', 'administrator']), LoosePerson.protected_attributes
+    assert_blank SpecialLoosePerson.accessible_attributes
+    assert_equal Set.new(['credit_rating', 'administrator']), SpecialLoosePerson.protected_attributes
 
-    assert_blank LoosePerson.accessible_attributes
-    assert_equal Set.new(['credit_rating']), LoosePerson.protected_attributes(:admin)
+    assert_blank SpecialLoosePerson.accessible_attributes
+    assert_equal Set.new(['credit_rating']), SpecialLoosePerson.protected_attributes(:admin)
 
     assert_blank LooseDescendant.accessible_attributes
     assert_equal Set.new(['credit_rating', 'administrator', 'phone_number']), LooseDescendant.protected_attributes
@@ -84,11 +84,11 @@ def test_mass_assignment_protection_inheritance
     assert_equal Set.new(['credit_rating', 'administrator', 'phone_number', 'name']), LooseDescendantSecond.protected_attributes,
       'Running attr_protected twice in one class should merge the protections'
 
-    assert_blank TightPerson.protected_attributes - TightPerson.attributes_protected_by_default
-    assert_equal Set.new(['name', 'address']), TightPerson.accessible_attributes
+    assert_blank SpecialTightPerson.protected_attributes - SpecialTightPerson.attributes_protected_by_default
+    assert_equal Set.new(['name', 'address']), SpecialTightPerson.accessible_attributes
 
-    assert_blank TightPerson.protected_attributes(:admin) - TightPerson.attributes_protected_by_default
-    assert_equal Set.new(['name', 'address', 'admin']), TightPerson.accessible_attributes(:admin)
+    assert_blank SpecialTightPerson.protected_attributes(:admin) - SpecialTightPerson.attributes_protected_by_default
+    assert_equal Set.new(['name', 'address', 'admin']), SpecialTightPerson.accessible_attributes(:admin)
 
     assert_blank TightDescendant.protected_attributes - TightDescendant.attributes_protected_by_default
     assert_equal Set.new(['name', 'address', 'phone_number']), TightDescendant.accessible_attributes
diff --git a/test/models/mass_assignment_specific.rb b/test/models/mass_assignment_specific.rb
index 1d123fa..17efa37 100644
--- a/test/models/mass_assignment_specific.rb
+++ b/test/models/mass_assignment_specific.rb
@@ -45,22 +45,22 @@ class Task
   public :sanitize_for_mass_assignment
 end
 
-class LoosePerson
+class SpecialLoosePerson
   include ActiveModel::MassAssignmentSecurity
   attr_protected :credit_rating, :administrator
   attr_protected :credit_rating, :as => :admin
 end
 
-class LooseDescendant < LoosePerson
+class LooseDescendant < SpecialLoosePerson
   attr_protected :phone_number
 end
 
-class LooseDescendantSecond< LoosePerson
+class LooseDescendantSecond< SpecialLoosePerson
   attr_protected :phone_number
   attr_protected :name
 end
 
-class TightPerson
+class SpecialTightPerson
   include ActiveModel::MassAssignmentSecurity
   attr_accessible :name, :address
   attr_accessible :name, :address, :admin, :as => :admin
@@ -70,7 +70,7 @@ def self.attributes_protected_by_default
   end
 end
 
-class TightDescendant < TightPerson
+class TightDescendant < SpecialTightPerson
   attr_accessible :phone_number
   attr_accessible :super_powers, :as => :admin
 end