github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5106 from kennyj/fix_warnings_20120210

Browse Source 
[3-2-stable] Fix some warnings
This commit is contained in:
Santiago Pastorino
2012-02-21 03:17:41 -08:00
parent b80d8f7111 39d4617033
commit c4265914fb
6 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actionpack/test/controller/base_test.rb
View File

@@ -167,7 +167,7 @@ class PerformActionTest < ActionController::TestCase
def test_get_on_priv_should_show_selector
use_controller MethodMissingController
assert_deprecated /Using `method_missing` to handle .* use `action_missing` instead/ do
assert_deprecated(/Using `method_missing` to handle .* use `action_missing` instead/) do
get :shouldnt_be_called
end
assert_response :success
@@ -178,7 +178,7 @@ class PerformActionTest < ActionController::TestCase
use_controller MethodMissingController
assert !@controller.__send__(:action_method?, 'method_missing')
assert_deprecated /Using `method_missing` to handle .* use `action_missing` instead/ do
assert_deprecated(/Using `method_missing` to handle .* use `action_missing` instead/) do
get :method_missing
end
assert_response :success
@@ -187,7 +187,7 @@ class PerformActionTest < ActionController::TestCase
def test_method_missing_should_recieve_symbol
use_controller AnotherMethodMissingController
assert_deprecated /Using `method_missing` to handle .* use `action_missing` instead/ do
assert_deprecated(/Using `method_missing` to handle .* use `action_missing` instead/) do
get :some_action
end
assert_kind_of NameError, @controller._exception

4
actionpack/test/controller/content_type_test.rb
View File

@@ -70,7 +70,7 @@ class ContentTypeTest < ActionController::TestCase
end
def test_render_changed_charset_default
assert_deprecated /Setting default charset at controller.*config\.action_dispatch\.default_charset/ do
assert_deprecated(/Setting default charset at controller.*config\.action_dispatch\.default_charset/) do
begin
OldContentTypeController.default_charset = "utf-16"
get :render_defaults
@@ -111,7 +111,7 @@ class ContentTypeTest < ActionController::TestCase
end
def test_nil_default_for_erb
assert_deprecated /Setting default charset at controller.*config\.action_dispatch\.default_charset/ do
assert_deprecated(/Setting default charset at controller.*config\.action_dispatch\.default_charset/) do
begin
OldContentTypeController.default_charset = nil
get :render_default_for_erb

1
actionpack/test/dispatch/routing_test.rb
View File

@@ -2574,7 +2574,6 @@ class TestUnicodePaths < ActionDispatch::IntegrationTest
Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
app.draw do
match "/#{Rack::Utils.escape("ほげ")}" => lambda { |env|
path_params = env['action_dispatch.request.path_parameters']
[200, { 'Content-Type' => 'text/plain' }, []]
}, :as => :unicode_path
end

41
actionpack/test/template/record_tag_helper_test.rb
View File

@@ -1,15 +1,15 @@
require 'abstract_unit'
require 'controller/fake_models'
class Post
class RecordTagPost
extend ActiveModel::Naming
include ActiveModel::Conversion
attr_writer :id, :body
attr_writer :id, :body, :persisted
def initialize
@id = nil
@body = nil
super
@persisted = false
end
def id
@@ -17,8 +17,11 @@ class Post
end
def body
super || @body || "What a wonderful world!"
@body || "What a wonderful world!"
end
def persisted?; @persisted end
end
class RecordTagHelperTest < ActionView::TestCase
@@ -28,30 +31,30 @@ class RecordTagHelperTest < ActionView::TestCase
def setup
super
@post = Post.new
@post = RecordTagPost.new
@post.persisted = true
end
def test_content_tag_for
expected = %(<li class="post bar" id="post_45"></li>)
expected = %(<li class="record_tag_post bar" id="record_tag_post_45"></li>)
actual = content_tag_for(:li, @post, :class => 'bar') { }
assert_dom_equal expected, actual
end
def test_content_tag_for_prefix
expected = %(<ul class="archived_post" id="archived_post_45"></ul>)
expected = %(<ul class="archived_record_tag_post" id="archived_record_tag_post_45"></ul>)
actual = content_tag_for(:ul, @post, :archived) { }
assert_dom_equal expected, actual
end
def test_content_tag_for_with_extra_html_tags
expected = %(<tr class="post bar" id="post_45" style='background-color: #f0f0f0'></tr>)
expected = %(<tr class="record_tag_post bar" id="record_tag_post_45" style='background-color: #f0f0f0'></tr>)
actual = content_tag_for(:tr, @post, {:class => "bar", :style => "background-color: #f0f0f0"}) { }
assert_dom_equal expected, actual
end
def test_block_not_in_erb_multiple_calls
expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
expected = %(<div class="record_tag_post bar" id="record_tag_post_45">#{@post.body}</div>)
actual = div_for(@post, :class => "bar") { @post.body }
assert_dom_equal expected, actual
actual = div_for(@post, :class => "bar") { @post.body }
@@ -59,29 +62,29 @@ class RecordTagHelperTest < ActionView::TestCase
end
def test_block_works_with_content_tag_for_in_erb
expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
expected = %(<tr class="record_tag_post" id="record_tag_post_45">#{@post.body}</tr>)
actual = render_erb("<%= content_tag_for(:tr, @post) do %><%= @post.body %><% end %>")
assert_dom_equal expected, actual
end
def test_div_for_in_erb
expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
expected = %(<div class="record_tag_post bar" id="record_tag_post_45">#{@post.body}</div>)
actual = render_erb("<%= div_for(@post, :class => 'bar') do %><%= @post.body %><% end %>")
assert_dom_equal expected, actual
end
def test_content_tag_for_collection
post_1 = Post.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
post_2 = Post.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
expected = %(<li class="post" id="post_101">Hello!</li>\n<li class="post" id="post_102">World!</li>)
post_1 = RecordTagPost.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
post_2 = RecordTagPost.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
expected = %(<li class="record_tag_post" id="record_tag_post_101">Hello!</li>\n<li class="record_tag_post" id="record_tag_post_102">World!</li>)
actual = content_tag_for(:li, [post_1, post_2]) { |post| concat post.body }
assert_dom_equal expected, actual
end
def test_div_for_collection
post_1 = Post.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
post_2 = Post.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
expected = %(<div class="post" id="post_101">Hello!</div>\n<div class="post" id="post_102">World!</div>)
post_1 = RecordTagPost.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
post_2 = RecordTagPost.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
expected = %(<div class="record_tag_post" id="record_tag_post_101">Hello!</div>\n<div class="record_tag_post" id="record_tag_post_102">World!</div>)
actual = div_for([post_1, post_2]) { |post| concat post.body }
assert_dom_equal expected, actual
end
@@ -92,8 +95,8 @@ class RecordTagHelperTest < ActionView::TestCase
end
def test_content_tag_for_collection_is_html_safe
post_1 = Post.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
post_2 = Post.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
post_1 = RecordTagPost.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
post_2 = RecordTagPost.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
result = content_tag_for(:li, [post_1, post_2]) { |post| concat post.body }
assert result.html_safe?
end

2
activerecord/lib/active_record/counter_cache.rb
View File

@@ -19,7 +19,7 @@ module ActiveRecord
counters.each do |association|
has_many_association = reflect_on_association(association.to_sym)
expected_name = if has_many_association.options[:as]
if has_many_association.options[:as]
has_many_association.options[:as].to_s.classify
else
self.name

2
activesupport/test/core_ext/range_ext_test.rb
View File

@@ -54,7 +54,7 @@ class RangeTest < Test::Unit::TestCase
end
def test_should_include_identical_exclusive_with_floats
assert (1.0...10.0).include?(1.0...10.0)
assert((1.0...10.0).include?(1.0...10.0))
end
def test_blockless_step