radiantcms-couchrest_model 0.1.4 → 0.1.5

data/vendor/rails/actionpack/test/controller/rescue_test.rb

@@ -281,23 +281,17 @@ class RescueControllerTest < ActionController::TestCase
   end
 
   def test_local_request_when_remote_addr_is_localhost
-    @controller.expects(:request).returns(@request).at_least(4)
+    @controller.expects(:request).returns(@request).at_least_once
     with_remote_addr '127.0.0.1' do
       assert @controller.send(:local_request?)
     end
-    with_remote_addr '::1' do
-      assert @controller.send(:local_request?)
-    end
   end
 
   def test_local_request_when_remote_addr_isnt_locahost
-    @controller.expects(:request).returns(@request).at_least(4)
+    @controller.expects(:request).returns(@request)
     with_remote_addr '1.2.3.4' do
       assert !@controller.send(:local_request?)
     end
-    with_remote_addr '2002::102:304' do
-      assert !@controller.send(:local_request?)
-    end
   end
 
   def test_rescue_responses

data/vendor/rails/actionpack/test/controller/routing_test.rb

@@ -1,4 +1,3 @@
-# encoding: us-ascii
 require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'action_controller/routing/route_set'
@@ -108,11 +107,7 @@ class StaticSegmentTest < Test::Unit::TestCase
   end
 end
 
-class DynamicSegmentTest < ActiveSupport::TestCase
-  def setup
-    @segment = nil
-  end
-
+class DynamicSegmentTest < Test::Unit::TestCase
   def segment(options = {})
     unless @segment
       @segment = ROUTING::DynamicSegment.new(:a, options)
@@ -346,11 +341,7 @@ class ControllerSegmentTest < Test::Unit::TestCase
   end
 end
 
-class PathSegmentTest < ActiveSupport::TestCase
-  def setup
-    @segment = nil
-  end
-
+class PathSegmentTest < Test::Unit::TestCase
   def segment(options = {})
     unless @segment
       @segment = ROUTING::PathSegment.new(:path, options)
@@ -763,7 +754,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
 
     ActionController::Routing.use_controllers! %w(content admin/user admin/news_feed)
   end
-
+  
   def teardown
     @rs.clear!
   end
@@ -1103,21 +1094,21 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
       map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
     end
     exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'post', :action => 'show', :bad_param => "foo", :use_route => "post") }
-    assert_match(/^post_url failed to generate/, exception.message)
+    assert_match /^post_url failed to generate/, exception.message
     from_match = exception.message.match(/from \{[^\}]+\}/).to_s
-    assert_match(/:bad_param=>"foo"/,   from_match)
-    assert_match(/:action=>"show"/,     from_match)
-    assert_match(/:controller=>"post"/, from_match)
+    assert_match /:bad_param=>"foo"/,   from_match
+    assert_match /:action=>"show"/,     from_match
+    assert_match /:controller=>"post"/, from_match
 
     expected_match = exception.message.match(/expected: \{[^\}]+\}/).to_s
-    assert_no_match(/:bad_param=>"foo"/,   expected_match)
-    assert_match(   /:action=>"show"/,     expected_match)
-    assert_match(   /:controller=>"post"/, expected_match)
+    assert_no_match /:bad_param=>"foo"/,   expected_match
+    assert_match    /:action=>"show"/,     expected_match
+    assert_match    /:controller=>"post"/, expected_match
 
     diff_match = exception.message.match(/diff: \{[^\}]+\}/).to_s
-    assert_match(   /:bad_param=>"foo"/,   diff_match)
-    assert_no_match(/:action=>"show"/,     diff_match)
-    assert_no_match(/:controller=>"post"/, diff_match)
+    assert_match    /:bad_param=>"foo"/,   diff_match
+    assert_no_match /:action=>"show"/,     diff_match
+    assert_no_match /:controller=>"post"/, diff_match
   end
 
   # this specifies the case where your formerly would get a very confusing error message with an empty diff
@@ -2573,10 +2564,10 @@ class RouteLoadingTest < Test::Unit::TestCase
 
     routes.reload
   end
-
+  
   def test_load_multiple_configurations
     routes.add_configuration_file("engines.rb")
-
+    
     File.expects(:stat).at_least_once.returns(@stat)
 
     routes.expects(:load).with('./config/routes.rb')

data/vendor/rails/actionpack/test/controller/send_file_test.rb

@@ -73,7 +73,7 @@ class SendFileTest < ActionController::TestCase
 
     assert_equal @controller.file_path, response.headers['X-Sendfile']
     assert response.body.blank?
-    assert !response.etag?, response.headers.inspect
+    assert !response.etag?
   end
 
   def test_data

data/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb

@@ -145,7 +145,7 @@ class CookieStoreTest < ActionController::IntegrationTest
     with_test_route_set do
       get '/no_session_access'
       assert_response :success
-      assert_equal nil, headers['Set-Cookie']
+      assert_equal "", headers['Set-Cookie']
     end
   end
 
@@ -155,7 +155,7 @@ class CookieStoreTest < ActionController::IntegrationTest
         "fef868465920f415f2c0652d6910d3af288a0367"
       get '/no_session_access'
       assert_response :success
-      assert_equal nil, headers['Set-Cookie']
+      assert_equal "", headers['Set-Cookie']
     end
   end
 

data/vendor/rails/actionpack/test/controller/session/test_session_test.rb

@@ -33,11 +33,11 @@ class ActionController::TestSessionTest < ActiveSupport::TestCase
     assert_equal('value', session[:key])
   end
   
-  def test_calling_delete_removes_item_and_returns_its_value
+  def test_calling_delete_removes_item
     session = ActionController::TestSession.new
     session[:key] = 'value'
     assert_equal('value', session[:key])
-    assert_equal('value', session.delete(:key))
+    session.delete(:key)
     assert_nil(session[:key])
   end
   

data/vendor/rails/actionpack/test/controller/url_rewriter_test.rb

@@ -65,11 +65,9 @@ class UrlRewriterTests < ActionController::TestCase
     @params[:action] = 'bye'
     @params[:id] = '2'
 
-    assert_deprecated /overwrite_params/ do
-      assert_equal '/hi/hi/2', @rewriter.rewrite(:only_path => true, :overwrite_params => {:action => 'hi'})
-      u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:action => 'hi'})
-      assert_match %r(/hi/hi/2$), u
-    end
+    assert_equal '/hi/hi/2', @rewriter.rewrite(:only_path => true, :overwrite_params => {:action => 'hi'})
+    u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:action => 'hi'})
+    assert_match %r(/hi/hi/2$), u
   end
 
   def test_overwrite_removes_original
@@ -77,11 +75,9 @@ class UrlRewriterTests < ActionController::TestCase
     @params[:action] = 'list'
     @params[:list_page] = 1
 
-    assert_deprecated /overwrite_params/ do
-      assert_equal '/search/list?list_page=2', @rewriter.rewrite(:only_path => true, :overwrite_params => {"list_page" => 2})
-      u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:list_page => 2})
-      assert_equal 'http://test.host/search/list?list_page=2', u
-    end
+    assert_equal '/search/list?list_page=2', @rewriter.rewrite(:only_path => true, :overwrite_params => {"list_page" => 2})
+    u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:list_page => 2})
+    assert_equal 'http://test.host/search/list?list_page=2', u
   end
 
   def test_to_str

data/vendor/rails/actionpack/test/fixtures/test/capturing.erb

@@ -1,4 +1,4 @@
 <% days = capture do %>
-  <p>Dreamy days</p>
+  Dreamy days
 <% end %>
-<%= days %>
+<%= days %>

data/vendor/rails/actionpack/test/fixtures/test/utf8.html.erb

@@ -1,4 +1,2 @@
-Русский <%= render :partial => 'test/utf8_partial' %>
-<%= "日".encoding %>
-<%= @output_buffer.encoding %>
-<%= __ENCODING__ %>
+Русский текст
+日本語のテキスト

data/vendor/rails/actionpack/test/template/active_record_helper_i18n_test.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 class ActiveRecordHelperI18nTest < Test::Unit::TestCase
   include ActionView::Helpers::ActiveRecordHelper
-
+  
   attr_reader :request
   def setup
     @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
@@ -35,17 +35,10 @@ class ActiveRecordHelperI18nTest < Test::Unit::TestCase
     I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
     error_messages_for(:object => @object, :locale => 'en')
   end
-
+  
   def test_error_messages_for_given_object_name_it_translates_object_name
     I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
     I18n.expects(:t).with(@object_name, :default => @object_name, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name
     error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
   end
-
-  def test_error_messages_for_given_object_name_with_underscore_it_translates_object_name
-    I18n.expects(:t).with('bank_account', :default => 'bank account', :count => 1, :scope => [:activerecord, :models]).once.returns 'bank account'
-    I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => 'bank account').returns "1 error prohibited this bank account from being saved"
-    error_messages_for(:object => @object, :locale => 'en', :object_name => 'bank_account')
-  end
 end
-

data/vendor/rails/actionpack/test/template/active_record_helper_test.rb

@@ -183,7 +183,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
   end
 
   def test_form_with_action_option
-    output_buffer << form("post", :action => "sign")
+    @response.body = form("post", :action => "sign")
     assert_select "form[action=sign]" do |form|
       assert_select "input[type=submit][value=Sign]"
     end

data/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb

@@ -128,6 +128,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   ImageLinkToTag = {
     %(image_tag("xml.png")) => %(<img alt="Xml" src="/images/xml.png" />),
+    %(image_tag("..jpg")) => %(<img alt="" src="/images/..jpg" />),
     %(image_tag("rss.gif", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.gif" />),
     %(image_tag("gold.png", :size => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
     %(image_tag("gold.png", "size" => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
@@ -163,11 +164,6 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_dom_equal(%(<script src="/javascripts/prototype.js?1" type="text/javascript"></script>\n<script src="/javascripts/effects.js?1" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js?1" type="text/javascript"></script>\n<script src="/javascripts/controls.js?1" type="text/javascript"></script>\n<script src="/javascripts/application.js?1" type="text/javascript"></script>), javascript_include_tag(:defaults))
   end
 
-  def test_javascript_include_tag_is_html_safe
-    assert javascript_include_tag(:defaults).html_safe?
-    assert javascript_include_tag("prototype").html_safe?
-  end
-
   def test_register_javascript_include_default
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'slider'
@@ -210,13 +206,6 @@ class AssetTagHelperTest < ActionView::TestCase
     StyleLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
-  def test_stylesheet_link_tag_is_html_safe
-    ENV["RAILS_ASSET_ID"] = ""
-    assert stylesheet_link_tag('dir/file').html_safe?
-    assert stylesheet_link_tag('dir/other/file', 'dir/file2').html_safe?
-    assert stylesheet_tag('dir/file', {}).html_safe?
-  end
-
   def test_custom_stylesheet_expansions
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => ["head", "body", "tail"]
     assert_dom_equal  %(<link href="/stylesheets/first.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/head.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/body.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/tail.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/last.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('first', :monkey, 'last')

data/vendor/rails/actionpack/test/template/benchmark_helper_test.rb

@@ -4,16 +4,16 @@ require 'action_view/helpers/benchmark_helper'
 class BenchmarkHelperTest < ActionView::TestCase
   tests ActionView::Helpers::BenchmarkHelper
 
-  def setup
-    super
-    controller.logger = ActiveSupport::BufferedLogger.new(StringIO.new)
-    controller.logger.auto_flushing = false
-  end
-
   def teardown
     controller.logger.send(:clear_buffer)
   end
 
+  def controller
+    logger = ActiveSupport::BufferedLogger.new(StringIO.new)
+    logger.auto_flushing = false
+    @controller ||= Struct.new(:logger).new(logger)
+  end
+
   def test_without_block
     assert_raise(LocalJumpError) { benchmark }
     assert buffer.empty?

data/vendor/rails/actionpack/test/template/compiled_templates_test.rb

@@ -2,9 +2,8 @@ require 'abstract_unit'
 require 'controller/fake_models'
 
 class CompiledTemplatesTest < Test::Unit::TestCase
-
+  
   def setup
-    @explicit_view_paths = nil
     @compiled_templates = ActionView::Base::CompiledTemplates
     @compiled_templates.instance_methods.each do |m|
       @compiled_templates.send(:remove_method, m) if m =~ /^_run_/

data/vendor/rails/actionpack/test/template/date_helper_i18n_test.rb

@@ -20,16 +20,15 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
       [60.seconds, true]  => [:'x_minutes',           1],
 
       # without include_seconds
-      [29.seconds,          false] => [:'less_than_x_minutes', 1],
-      [60.seconds,          false] => [:'x_minutes',           1],
-      [44.minutes,          false] => [:'x_minutes',           44],
-      [61.minutes,          false] => [:'about_x_hours',       1],
-      [24.hours,            false] => [:'x_days',              1],
-      [30.days,             false] => [:'about_x_months',      1],
-      [60.days,             false] => [:'x_months',            2],
-      [1.year,              false] => [:'about_x_years',       1],
-      [3.years + 6.months,  false] => [:'over_x_years',        3],
-      [3.years + 10.months, false] => [:'almost_x_years',      4]
+      [29.seconds, false] => [:'less_than_x_minutes', 1],
+      [60.seconds, false] => [:'x_minutes',           1],
+      [44.minutes, false] => [:'x_minutes',           44],
+      [61.minutes, false] => [:'about_x_hours',       1],
+      [24.hours,   false] => [:'x_days',              1],
+      [30.days,    false] => [:'about_x_months',      1],
+      [60.days,    false] => [:'x_months',            2],
+      [1.year,     false] => [:'about_x_years',       1],
+      [3.years,    false] => [:'over_x_years',        3]
 
       }.each do |passed, expected|
       assert_distance_of_time_in_words_translates_key passed, expected

data/vendor/rails/actionpack/test/template/date_helper_test.rb

@@ -53,14 +53,13 @@ class DateHelperTest < ActionView::TestCase
     assert_equal "about 2 hours", distance_of_time_in_words(from, to + 89.minutes + 30.seconds)
     assert_equal "about 24 hours", distance_of_time_in_words(from, to + 23.hours + 59.minutes + 29.seconds)
 
-    # 1440..2529
+    # 1440..2879
     assert_equal "1 day", distance_of_time_in_words(from, to + 23.hours + 59.minutes + 30.seconds)
-    assert_equal "1 day", distance_of_time_in_words(from, to + 41.hours + 59.minutes + 29.seconds)
+    assert_equal "1 day", distance_of_time_in_words(from, to + 47.hours + 59.minutes + 29.seconds)
 
-    # 2530..43199
-    assert_equal "2 days", distance_of_time_in_words(from, to + 42.hours + 59.minutes + 30.seconds)
-    assert_equal "3 days", distance_of_time_in_words(from, to + 2.days + 12.hours)
-    assert_equal "30 days", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 29.seconds)
+    # 2880..43199
+    assert_equal "2 days", distance_of_time_in_words(from, to + 47.hours + 59.minutes + 30.seconds)
+    assert_equal "29 days", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 29.seconds)
 
     # 43200..86399
     assert_equal "about 1 month", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 30.seconds)
@@ -70,28 +69,13 @@ class DateHelperTest < ActionView::TestCase
     assert_equal "2 months", distance_of_time_in_words(from, to + 59.days + 23.hours + 59.minutes + 30.seconds)
     assert_equal "12 months", distance_of_time_in_words(from, to + 1.years - 31.seconds)
 
-    # > 525599
-    assert_equal "about 1 year",    distance_of_time_in_words(from, to + 1.years - 30.seconds)
-    assert_equal "about 1 year",    distance_of_time_in_words(from, to + 1.years + 3.months - 1.day)
-    assert_equal "over 1 year",     distance_of_time_in_words(from, to + 1.years + 6.months)
-
-    assert_equal "almost 2 years",  distance_of_time_in_words(from, to + 2.years - 3.months + 1.day)
-    assert_equal "about 2 years",   distance_of_time_in_words(from, to + 2.years + 3.months - 1.day)
-    assert_equal "over 2 years",    distance_of_time_in_words(from, to + 2.years + 3.months + 1.day)
-    assert_equal "over 2 years",    distance_of_time_in_words(from, to + 2.years + 9.months - 1.day)
-    assert_equal "almost 3 years",  distance_of_time_in_words(from, to + 2.years + 9.months + 1.day)
-
-    assert_equal "almost 5 years",  distance_of_time_in_words(from, to + 5.years - 3.months + 1.day)
-    assert_equal "about 5 years",   distance_of_time_in_words(from, to + 5.years + 3.months - 1.day)
-    assert_equal "over 5 years",    distance_of_time_in_words(from, to + 5.years + 3.months + 1.day)
-    assert_equal "over 5 years",    distance_of_time_in_words(from, to + 5.years + 9.months - 1.day)
-    assert_equal "almost 6 years",  distance_of_time_in_words(from, to + 5.years + 9.months + 1.day)
-
-    assert_equal "almost 10 years", distance_of_time_in_words(from, to + 10.years - 3.months + 1.day)
-    assert_equal "about 10 years",  distance_of_time_in_words(from, to + 10.years + 3.months - 1.day)
-    assert_equal "over 10 years",   distance_of_time_in_words(from, to + 10.years + 3.months + 1.day)
-    assert_equal "over 10 years",   distance_of_time_in_words(from, to + 10.years + 9.months - 1.day)
-    assert_equal "almost 11 years", distance_of_time_in_words(from, to + 10.years + 9.months + 1.day)
+    # 525600..1051199
+    assert_equal "about 1 year", distance_of_time_in_words(from, to + 1.years - 30.seconds)
+    assert_equal "about 1 year", distance_of_time_in_words(from, to + 2.years - 31.seconds)
+
+    # > 1051199
+    assert_equal "over 2 years", distance_of_time_in_words(from, to + 2.years + 30.seconds)
+    assert_equal "over 10 years", distance_of_time_in_words(from, to + 10.years)
 
     # test to < from
     assert_equal "about 4 hours", distance_of_time_in_words(from + 4.hours, to)
@@ -120,7 +104,7 @@ class DateHelperTest < ActionView::TestCase
   def test_distance_in_words_with_dates
     start_date = Date.new 1975, 1, 31
     end_date = Date.new 1977, 1, 31
-    assert_equal("about 2 years", distance_of_time_in_words(start_date, end_date))
+    assert_equal("over 2 years", distance_of_time_in_words(start_date, end_date))
   end
 
   def test_distance_in_words_with_integers
@@ -1229,23 +1213,6 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", :order => [ :month, :year ])
   end
 
-  def test_date_select_without_day_and_with_disabled_html_option
-    @post = Post.new
-    @post.written_on = Date.new(2004, 6, 15)
-
-    expected = "<input type=\"hidden\" id=\"post_written_on_3i\" disabled=\"disabled\" name=\"post[written_on(3i)]\" value=\"1\" />\n"
-
-    expected <<  %{<select id="post_written_on_2i" disabled="disabled" name="post[written_on(2i)]">\n}
-    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
-    expected << "</select>\n"
-
-    expected << %{<select id="post_written_on_1i" disabled="disabled" name="post[written_on(1i)]">\n}
-    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
-    expected << "</select>\n"
-
-    assert_dom_equal expected, date_select("post", "written_on", { :order => [ :month, :year ] }, :disabled => true)
-  end
-
   def test_date_select_within_fields_for
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
@@ -1730,25 +1697,6 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, time_select("post", "written_on", :prompt => {:hour => 'Choose hour', :minute => 'Choose minute'})
   end
 
-  def test_time_select_with_disabled_html_option
-    @post = Post.new
-    @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
-
-    expected = %{<input type="hidden" id="post_written_on_1i" disabled="disabled" name="post[written_on(1i)]" value="2004" />\n}
-    expected << %{<input type="hidden" id="post_written_on_2i" disabled="disabled" name="post[written_on(2i)]" value="6" />\n}
-    expected << %{<input type="hidden" id="post_written_on_3i" disabled="disabled" name="post[written_on(3i)]" value="15" />\n}
-
-    expected << %(<select id="post_written_on_4i" disabled="disabled" name="post[written_on(4i)]">\n)
-    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
-    expected << "</select>\n"
-    expected << " : "
-    expected << %(<select id="post_written_on_5i" disabled="disabled" name="post[written_on(5i)]">\n)
-    0.upto(59) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 16}>#{sprintf("%02d", i)}</option>\n) }
-    expected << "</select>\n"
-
-    assert_dom_equal expected, time_select("post", "written_on", {}, :disabled => true)
-  end
-
   def test_datetime_select
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
@@ -2209,66 +2157,6 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at", :discard_year => true, :discard_month => true)
   end
 
-  def test_datetime_select_discard_year_and_month_with_disabled_html_option
-    @post = Post.new
-    @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
-
-    expected = %{<input type="hidden" id="post_updated_at_1i" disabled="disabled" name="post[updated_at(1i)]" value="2004" />\n}
-    expected << %{<input type="hidden" id="post_updated_at_2i" disabled="disabled" name="post[updated_at(2i)]" value="6" />\n}
-    expected << %{<input type="hidden" id="post_updated_at_3i" disabled="disabled" name="post[updated_at(3i)]" value="15" />\n}
-
-    expected << %{<select id="post_updated_at_4i" disabled="disabled" name="post[updated_at(4i)]">\n}
-    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
-    expected << "</select>\n"
-    expected << " : "
-    expected << %{<select id="post_updated_at_5i" disabled="disabled" name="post[updated_at(5i)]">\n}
-    0.upto(59) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 16}>#{sprintf("%02d", i)}</option>\n) }
-    expected << "</select>\n"
-
-    assert_dom_equal expected, datetime_select("post", "updated_at", { :discard_year => true, :discard_month => true }, :disabled => true)
-  end
-
-  def test_datetime_select_discard_hour
-    @post = Post.new
-    @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
-
-    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
-    1999.upto(2009) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 2004}>#{i}</option>\n) }
-    expected << "</select>\n"
-    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
-    1.upto(12) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 6}>#{Date::MONTHNAMES[i]}</option>\n) }
-    expected << "</select>\n"
-    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
-    1.upto(31) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 15}>#{i}</option>\n) }
-    expected << "</select>\n"
-
-    assert_dom_equal expected, datetime_select("post", "updated_at", :discard_hour => true)
-  end
-
-  def test_datetime_select_discard_minute
-    @post = Post.new
-    @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
-
-    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
-    1999.upto(2009) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 2004}>#{i}</option>\n) }
-    expected << "</select>\n"
-    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
-    1.upto(12) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 6}>#{Date::MONTHNAMES[i]}</option>\n) }
-    expected << "</select>\n"
-    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
-    1.upto(31) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 15}>#{i}</option>\n) }
-    expected << "</select>\n"
-
-    expected << " &mdash; "
-
-    expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
-    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
-    expected << "</select>\n"
-    expected << %{<input type="hidden" id="post_updated_at_5i" name="post[updated_at(5i)]" value="16" />\n}
-
-    assert_dom_equal expected, datetime_select("post", "updated_at", :discard_minute => true)
-  end
-
   def test_datetime_select_invalid_order
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
@@ -2571,28 +2459,6 @@ class DateHelperTest < ActionView::TestCase
     }, options)
   end
 
-  def test_select_html_safety
-    assert select_day(16).html_safe?
-    assert select_month(8).html_safe?
-    assert select_year(Time.mktime(2003, 8, 16, 8, 4, 18)).html_safe?
-    assert select_minute(Time.mktime(2003, 8, 16, 8, 4, 18)).html_safe?
-    assert select_second(Time.mktime(2003, 8, 16, 8, 4, 18)).html_safe?
-
-    assert select_minute(8, :use_hidden => true).html_safe?
-    assert select_month(8, :prompt => 'Choose month').html_safe?
-
-    assert select_time(Time.mktime(2003, 8, 16, 8, 4, 18), {}, :class => 'selector').html_safe?
-    assert select_date(Time.mktime(2003, 8, 16), :date_separator => " / ", :start_year => 2003, :end_year => 2005, :prefix => "date[first]").html_safe?
-  end
-  
-  def test_object_select_html_safety
-    @post = Post.new
-    @post.written_on = Date.new(2004, 6, 15)
-
-    assert date_select("post", "written_on", :default => Time.local(2006, 9, 19, 15, 16, 35), :include_blank => true).html_safe?    
-    assert time_select("post", "written_on", :ignore_date => true).html_safe?    
-  end
-
   protected
     def with_env_tz(new_tz = 'US/Eastern')
       old_tz, ENV['TZ'] = ENV['TZ'], new_tz