From e30a7e035ef3019f3513ac768f12da763291993b Mon Sep 17 00:00:00 2001 From: Thiago Pradi <thiago.pradi@gmail.com> Date: Sat, 14 Mar 2015 16:07:41 -0300 Subject: Deleting unused fixtures --- actionview/test/fixtures/multipart/bracketed_utf8_param | 5 ----- actionview/test/fixtures/multipart/single_utf8_param | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 actionview/test/fixtures/multipart/bracketed_utf8_param delete mode 100644 actionview/test/fixtures/multipart/single_utf8_param (limited to 'actionview/test') diff --git a/actionview/test/fixtures/multipart/bracketed_utf8_param b/actionview/test/fixtures/multipart/bracketed_utf8_param deleted file mode 100644 index df9cecea08..0000000000 --- a/actionview/test/fixtures/multipart/bracketed_utf8_param +++ /dev/null @@ -1,5 +0,0 @@ ---AaB03x -Content-Disposition: form-data; name="Iñtërnâtiônàlizætiøn_name[Iñtërnâtiônàlizætiøn_nested_name]" - -Iñtërnâtiônàlizætiøn_value ---AaB03x-- diff --git a/actionview/test/fixtures/multipart/single_utf8_param b/actionview/test/fixtures/multipart/single_utf8_param deleted file mode 100644 index 1d9fae7b17..0000000000 --- a/actionview/test/fixtures/multipart/single_utf8_param +++ /dev/null @@ -1,5 +0,0 @@ ---AaB03x -Content-Disposition: form-data; name="Iñtërnâtiônàlizætiøn_name" - -Iñtërnâtiônàlizætiøn_value ---AaB03x-- -- cgit v1.2.3 From c9cab9c74c57e4a41793e0b12192fa32e370ff42 Mon Sep 17 00:00:00 2001 From: Thiago Pradi <thiago.pradi@gmail.com> Date: Sat, 14 Mar 2015 16:17:42 -0300 Subject: Cleaning unused methods from abstract_unit --- actionview/test/abstract_unit.rb | 57 ---------------------------------------- 1 file changed, 57 deletions(-) (limited to 'actionview/test') diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 3eded74f1b..4635c645d0 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -49,20 +49,6 @@ I18n.backend.store_translations 'pt-BR', {} ORIGINAL_LOCALES = I18n.available_locales.map(&:to_s).sort FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') -FIXTURES = Pathname.new(FIXTURE_LOAD_PATH) - -module RackTestUtils - def body_to_string(body) - if body.respond_to?(:each) - str = "" - body.each {|s| str << s } - str - else - body - end - end - extend self -end module RenderERBUtils def view @@ -225,49 +211,6 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase end end -# Temporary base class -class Rack::TestCase < ActionDispatch::IntegrationTest - def self.testing(klass = nil) - if klass - @testing = "/#{klass.name.underscore}".sub!(/_controller$/, '') - else - @testing - end - end - - def get(thing, *args) - if thing.is_a?(Symbol) - super("#{self.class.testing}/#{thing}", *args) - else - super - end - end - - def assert_body(body) - assert_equal body, Array(response.body).join - end - - def assert_status(code) - assert_equal code, response.status - end - - def assert_response(body, status = 200, headers = {}) - assert_body body - assert_status status - headers.each do |header, value| - assert_header header, value - end - end - - def assert_content_type(type) - assert_equal type, response.headers["Content-Type"] - end - - def assert_header(name, value) - assert_equal value, response.headers[name] - end -end - ActionView::RoutingUrlFor.include(ActionDispatch::Routing::UrlFor) module ActionController -- cgit v1.2.3 From abacce174cb3dcd9ca22a027d5fe89e8031798f6 Mon Sep 17 00:00:00 2001 From: Thiago Pradi <thiago.pradi@gmail.com> Date: Sat, 14 Mar 2015 16:19:43 -0300 Subject: Zlib isn't required for AssetTagHelperTest anymore --- actionview/test/template/asset_tag_helper_test.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'actionview/test') diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb index a15c6fac90..02dce71496 100644 --- a/actionview/test/template/asset_tag_helper_test.rb +++ b/actionview/test/template/asset_tag_helper_test.rb @@ -1,4 +1,3 @@ -require 'zlib' require 'abstract_unit' require 'active_support/ordered_options' -- cgit v1.2.3 From cc67dd9644b660cd7f3ed89f731c23caa7534cf1 Mon Sep 17 00:00:00 2001 From: Thiago Pradi <thiago.pradi@gmail.com> Date: Sat, 14 Mar 2015 16:32:03 -0300 Subject: Cleaning unused views from actionpack tests inside actionview --- .../actionpack/abstract/views/abstract_controller/testing/me5/index.erb | 1 - 1 file changed, 1 deletion(-) delete mode 100644 actionview/test/actionpack/abstract/views/abstract_controller/testing/me5/index.erb (limited to 'actionview/test') diff --git a/actionview/test/actionpack/abstract/views/abstract_controller/testing/me5/index.erb b/actionview/test/actionpack/abstract/views/abstract_controller/testing/me5/index.erb deleted file mode 100644 index 84d0b7417e..0000000000 --- a/actionview/test/actionpack/abstract/views/abstract_controller/testing/me5/index.erb +++ /dev/null @@ -1 +0,0 @@ -Hello from me5/index.erb \ No newline at end of file -- cgit v1.2.3 From 56a7f156afface0731483b673afb72d17c81875c Mon Sep 17 00:00:00 2001 From: Thiago Pradi <thiago.pradi@gmail.com> Date: Sat, 14 Mar 2015 16:37:42 -0300 Subject: Cleaning JavaScriptHelperTest --- actionview/test/template/javascript_helper_test.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'actionview/test') diff --git a/actionview/test/template/javascript_helper_test.rb b/actionview/test/template/javascript_helper_test.rb index 9ba7f64ad1..9f1535ef53 100644 --- a/actionview/test/template/javascript_helper_test.rb +++ b/actionview/test/template/javascript_helper_test.rb @@ -3,14 +3,7 @@ require 'abstract_unit' class JavaScriptHelperTest < ActionView::TestCase tests ActionView::Helpers::JavaScriptHelper - def _evaluate_assigns_and_ivars() end - - attr_accessor :formats, :output_buffer - - def update_details(details) - @details = details - yield if block_given? - end + attr_accessor :output_buffer setup do @old_escape_html_entities_in_json = ActiveSupport.escape_html_entities_in_json -- cgit v1.2.3