kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Got controller/mime_responds_test.rb running on the new base

Browse source
This commit is contained in:
Yehuda Katz + Carl Lerche 2009-05-20 16:52:56 -07:00
parent 8e7a87d299
commit c4a6109286
6 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actionpack/Rakefile
View file

@ -58,10 +58,11 @@ end
desc 'Old Controller Tests on New Base'
Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
t.libs << "test/new_base" << "test"
# content_type mime_responds layout
# content_type layout
# Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
t.test_files = %w(
addresses_render base benchmark caching capture dispatcher record_identifier
redirect render rescue url_rewriter webservice flash
addresses_render base benchmark caching capture dispatcher flash mime_responds
record_identifier redirect render rescue url_rewriter webservice
).map { |name| "test/controller/#{name}_test.rb" }
end

2
actionpack/test/abstract_unit.rb
View file

@ -23,6 +23,8 @@ require 'action_controller'
require 'action_controller/testing/process'
require 'action_view/test_case'
$tags[:old_base] = true
# Show backtraces for deprecated behavior for quicker cleanup.
ActiveSupport::Deprecation.debug = true

26
actionpack/test/controller/mime_responds_test.rb
View file

@ -375,9 +375,11 @@ class MimeControllerTest < ActionController::TestCase
end
def test_rjs_type_skips_layout
@request.accept = "text/javascript"
get :all_types_with_layout
assert_equal 'RJS for all_types_with_layout', @response.body
pending(:new_base) do
@request.accept = "text/javascript"
get :all_types_with_layout
assert_equal 'RJS for all_types_with_layout', @response.body
end
end
def test_html_type_with_layout
@ -510,7 +512,7 @@ class SuperPostController < PostController
end
end
if ENV["new_base"]
if defined?(ActionController::Http)
PostController._write_layout_method
SuperPostController._write_layout_method
end
@ -532,14 +534,16 @@ class MimeControllerLayoutsTest < ActionController::TestCase
assert_equal 'Hello iPhone', @response.body
end
def test_format_with_inherited_layouts
@controller = SuperPostController.new
for_tag(:old_base) do
def test_format_with_inherited_layouts
@controller = SuperPostController.new
get :index
assert_equal 'Super Firefox', @response.body
get :index
assert_equal 'Super Firefox', @response.body
@request.accept = "text/iphone"
get :index
assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body
@request.accept = "text/iphone"
get :index
assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body
end
end
end

3
actionpack/test/new_base/abstract_unit.rb
View file

@ -16,6 +16,9 @@ require 'action_view/test_case'
require 'action_controller/testing/integration'
require 'active_support/dependencies'
$tags[:new_base] = true
ActiveSupport::Dependencies.hook!
FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), '../fixtures')

5
activesupport/lib/active_support/test_case.rb
View file

@ -32,6 +32,11 @@ module ActiveSupport
include ActiveSupport::Testing::Default
end
$tags = {}
def self.for_tag(tag)
yield if $tags[tag]
end
include ActiveSupport::Testing::SetupAndTeardown
include ActiveSupport::Testing::Assertions
include ActiveSupport::Testing::Deprecation

5
activesupport/lib/active_support/testing/pending.rb
View file

@ -11,6 +11,11 @@ module ActiveSupport
@@at_exit = false
def pending(description = "", &block)
if description.is_a?(Symbol)
is_pending = $tags[description]
return block.call unless is_pending
end
if block_given?
failed = false