0
@@ -26,7 +26,7 @@ module When
0
                       callback.call(record)
0
                     else
0
                       raise ActiveRecord::ActiveRecordError, 
0
-                        "Callbacks must be a symbol denoting the method to call, a string to be evaluated, a block to be invoked, or an object responding to the callback method."
0
+                        'Callbacks must be a symbol denoting the method to call, a string to be evaluated or a block to be invoked.'
0
                     end
0
                   end
0
                 end

0
@@ -18,13 +18,11 @@ module When
0
                       (! options[:unless].nil? && ActiveRecord::Base.evaluate_condition(options[:unless], controller))
0
                     if filter.class == Symbol
0
                       controller.send filter
0
-                    elsif filter.class == String
0
-                      eval(filter, binding)
0
                     elsif filter.class == Proc || filter.class == Method
0
                       filter.call(controller)
0
                     else
0
                       raise ActionController::ActionControllerError, 
0
-                        "Filters must be a symbol denoting the method to call, a string to be evaluated, a block to be invoked, or an object responding to the callback method."
0
+                        'Filters must be a symbol denoting the method to call evaluated or a block to be invoked.'
0
                     end
0
                   end
0
                 end

0
@@ -197,154 +197,6 @@ class FiltersTest < ActionController::TestCase
0
 
0
   conditions.each do |condition|
0
     basic_filters.each do |filter|
0
-      define_method "test_#{filter}_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :if => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = true
0
-
0
-        get :index
0
-        assert_equal 'new bio', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :if => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = false
0
-
0
-        get :index
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :unless => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = true
0
-
0
-        get :index
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :unless => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = false
0
-
0
-        get :index
0
-        assert_equal 'new bio', CompaniesController.bio
0
-      end
0
-
0
-      define_method "test_#{filter}_with_only_option_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :only => :show, :if => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = true
0
-
0
-        get :index
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-
0
-        get :show
0
-        assert_equal 'new bio', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_only_option_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :only => :show, :if => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = false
0
-
0
-        get :index
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-
0
-        get :show
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_only_option_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :only => :show, :unless => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = true
0
-
0
-        get :index
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-
0
-        get :show
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_only_option_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :only => :show, :unless => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = false
0
-
0
-        get :index
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-
0
-        get :show
0
-        assert_equal 'new bio', CompaniesController.bio
0
-      end
0
-
0
-      define_method "test_#{filter}_with_except_option_with_if_condition_#{condition.class}_which_returns_true_should_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :except => :show, :if => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = true
0
-
0
-        get :show
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-
0
-        get :index
0
-        assert_equal 'new bio', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_except_option_if_condition_#{condition.class}_which_returns_false_should_not_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :except => :show, :if => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = false
0
-
0
-        get :show
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-
0
-        get :index
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_except_option_unless_condition_#{condition.class}_which_returns_true_should_not_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :except => :show, :unless => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = true
0
-
0
-        get :show
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-
0
-        get :index
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-      end
0
-      
0
-      define_method "test_#{filter}_with_except_option_unless_condition_#{condition.class}_which_returns_false_should_change_company_bio" do
0
-        CompaniesController.send filter.to_sym, 'self.bio = "new bio"', :except => :show, :unless => condition
0
-
0
-        CompaniesController.bio = 'thoughtbot'
0
-        @controller.flag = false
0
-
0
-        get :show
0
-        assert_equal 'thoughtbot', CompaniesController.bio
0
-
0
-        get :index
0
-        assert_equal 'new bio', CompaniesController.bio
0
-      end
0
-    end
0
-  end
0
-
0
-  conditions.each do |condition|
0
-    basic_filters.each do |filter|
0
       define_method "test_#{filter}_with_block_callback_with_if_condition_#{condition.class}_which_returns_true_should_change_company_name" do
0
         CompaniesController.send filter.to_sym, :if => condition do |controller|
0
           controller.change_name