From 481e49c64f790e46f4aff3ed539ed227d2eb46cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 2 Jan 2015 22:08:41 -0300 Subject: Remove deprecated methods at `Kernel`. `silence_stderr`, `silence_stream`, `capture` and `quietly`. --- railties/test/generators/generators_test_helper.rb | 10 ++++++++++ railties/test/isolation/abstract_unit.rb | 10 ++++++++++ 2 files changed, 20 insertions(+) (limited to 'railties/test') diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index 6cc91f166b..94099fcd2e 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -49,4 +49,14 @@ module GeneratorsTestHelper end end end + + def silence_stream(stream) + old_stream = stream.dup + stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null') + stream.sync = true + yield + ensure + stream.reopen(old_stream) + old_stream.close + end end diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 9ad0ec0d34..39e8a5f756 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -338,6 +338,16 @@ class ActiveSupport::TestCase end end end + + def silence_stream(stream) + old_stream = stream.dup + stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null') + stream.sync = true + yield + ensure + stream.reopen(old_stream) + old_stream.close + end end # Create a scope and build a fixture rails app -- cgit v1.2.3 From d282125a18c1697a9b5bb775628a2db239142ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sat, 3 Jan 2015 17:17:16 -0300 Subject: Remove deprecate `*_path` helpers in email views --- .../application/initializers/frameworks_test.rb | 1 - railties/test/application/mailer_previews_test.rb | 52 ---------------------- railties/test/railties/engine_test.rb | 4 +- 3 files changed, 2 insertions(+), 55 deletions(-) (limited to 'railties/test') diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb index 2d45c9b53f..97b51911d9 100644 --- a/railties/test/application/initializers/frameworks_test.rb +++ b/railties/test/application/initializers/frameworks_test.rb @@ -65,7 +65,6 @@ module ApplicationTests RUBY require "#{app_path}/config/environment" - assert Foo.method_defined?(:foo_path) assert Foo.method_defined?(:foo_url) assert Foo.method_defined?(:main_app) end diff --git a/railties/test/application/mailer_previews_test.rb b/railties/test/application/mailer_previews_test.rb index 9e4f858539..1752a9f3c6 100644 --- a/railties/test/application/mailer_previews_test.rb +++ b/railties/test/application/mailer_previews_test.rb @@ -428,58 +428,6 @@ module ApplicationTests assert_match '', last_response.body end - test "*_path helpers emit a deprecation" do - - app_file "config/routes.rb", <<-RUBY - Rails.application.routes.draw do - get 'foo', to: 'foo#index' - end - RUBY - - mailer 'notifier', <<-RUBY - class Notifier < ActionMailer::Base - default from: "from@example.com" - - def path_in_view - mail to: "to@example.org" - end - - def path_in_mailer - @url = foo_path - mail to: "to@example.org" - end - end - RUBY - - html_template 'notifier/path_in_view', "<%= link_to 'foo', foo_path %>" - - mailer_preview 'notifier', <<-RUBY - class NotifierPreview < ActionMailer::Preview - def path_in_view - Notifier.path_in_view - end - - def path_in_mailer - Notifier.path_in_mailer - end - end - RUBY - - app('development') - - assert_deprecated do - get "/rails/mailers/notifier/path_in_view.html" - assert_equal 200, last_response.status - end - - html_template 'notifier/path_in_mailer', "No ERB in here" - - assert_deprecated do - get "/rails/mailers/notifier/path_in_mailer.html" - assert_equal 200, last_response.status - end - end - private def build_app super diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb index 4ffcf64275..6185742cc1 100644 --- a/railties/test/railties/engine_test.rb +++ b/railties/test/railties/engine_test.rb @@ -741,8 +741,8 @@ YAML assert_equal "bukkits_", Bukkits.table_name_prefix assert_equal "bukkits", Bukkits::Engine.engine_name assert_equal Bukkits.railtie_namespace, Bukkits::Engine - assert ::Bukkits::MyMailer.method_defined?(:foo_path) - assert !::Bukkits::MyMailer.method_defined?(:bar_path) + assert ::Bukkits::MyMailer.method_defined?(:foo_url) + assert !::Bukkits::MyMailer.method_defined?(:bar_url) get("/bukkits/from_app") assert_equal "false", last_response.body -- cgit v1.2.3 From a939506f297b667291480f26fa32a373a18ae06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sun, 4 Jan 2015 00:24:40 -0300 Subject: Change the default `null` value for `timestamps` to `false` --- railties/test/generators/model_generator_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test') diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb index afee0a655d..f3b699101f 100644 --- a/railties/test/generators/model_generator_test.rb +++ b/railties/test/generators/model_generator_test.rb @@ -223,7 +223,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase def test_migration_with_timestamps run_generator - assert_migration "db/migrate/create_accounts.rb", /t.timestamps null: false/ + assert_migration "db/migrate/create_accounts.rb", /t.timestamps/ end def test_migration_timestamps_are_skipped -- cgit v1.2.3 From c2e865849beadd99866e521a93d733da7d1b5255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sun, 4 Jan 2015 11:35:20 -0300 Subject: Remove deprecation warning when log_level is not explicit set on production --- railties/test/application/configuration_test.rb | 30 ------------------------- 1 file changed, 30 deletions(-) (limited to 'railties/test') diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index ad15e30b6a..b3995c9a6f 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -1062,36 +1062,6 @@ module ApplicationTests end end - test "Blank config.log_level is not deprecated for non-production environment" do - with_rails_env "development" do - assert_not_deprecated do - make_basic_app do |application| - application.config.log_level = nil - end - end - end - end - - test "Blank config.log_level is deprecated for the production environment" do - with_rails_env "production" do - assert_deprecated(/log_level/) do - make_basic_app do |application| - application.config.log_level = nil - end - end - end - end - - test "Not blank config.log_level is not deprecated for the production environment" do - with_rails_env "production" do - assert_not_deprecated do - make_basic_app do |application| - application.config.log_level = :info - end - end - end - end - test "config.log_level with custom logger" do make_basic_app do |application| application.config.logger = Logger.new(STDOUT) -- cgit v1.2.3 From 463b5d7581ee16bfaddf34ca349b7d1b5878097c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sun, 4 Jan 2015 11:39:12 -0300 Subject: Remove deprecated `serve_static_assets` configuration --- railties/test/application/configuration_test.rb | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'railties/test') diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index b3995c9a6f..8f5b2d0d68 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -320,22 +320,6 @@ module ApplicationTests end end - test "config.serve_static_assets is deprecated" do - require "#{app_path}/config/application" - - assert_deprecated(/serve_static_assets/) do - app.config.serve_static_assets = false - end - - assert_not app.config.serve_static_files - assert_deprecated(/serve_static_assets/) { assert_not app.config.serve_static_assets } - - app.config.serve_static_files = true - - assert app.config.serve_static_files - assert_deprecated(/serve_static_assets/) { assert app.config.serve_static_assets } - end - test "Use key_generator when secret_key_base is set" do make_basic_app do |application| application.secrets.secret_key_base = 'b3c631c314c0bbca50c1b2843150fe33' -- cgit v1.2.3