diff options
author | Xavier Noria <fxn@hashref.com> | 2016-08-07 11:48:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-07 11:48:29 +0200 |
commit | fb98d2e57162876c0e1823a5357bc44a932d08b9 (patch) | |
tree | 2c3225f7698ef3f7b2556510136c64a58ecf7355 /railties/test | |
parent | 0d12708f3967fe93c172b30bd3e98e4433761c36 (diff) | |
parent | 762e3f05f3d372cb32570db0deeef27232c4dd00 (diff) | |
download | rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.gz rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.bz2 rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.zip |
Merge pull request #26077 from kamipo/add_stype_empty_lines
Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty lines
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/configuration_test.rb | 1 | ||||
-rw-r--r-- | railties/test/commands/console_test.rb | 1 | ||||
-rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 1 | ||||
-rw-r--r-- | railties/test/railties/engine_test.rb | 2 | ||||
-rw-r--r-- | railties/test/railties/mounted_engine_test.rb | 2 |
5 files changed, 0 insertions, 7 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index ee482009d8..94d3bbd165 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -666,7 +666,6 @@ module ApplicationTests end RUBY - app_file "app/controllers/posts_controller.rb", <<-RUBY class PostsController < ApplicationController def index diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb index b3343d9b7f..96ac7c0661 100644 --- a/railties/test/commands/console_test.rb +++ b/railties/test/commands/console_test.rb @@ -40,7 +40,6 @@ class Rails::ConsoleTest < ActiveSupport::TestCase def test_start_with_sandbox start ["--sandbox"] - assert app.console.started? assert app.sandbox assert_match(/Loading \w+ environment in sandbox \(Rails/, output) diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index d20c2266a8..f5b1532e5f 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -618,7 +618,6 @@ class PluginGeneratorTest < Rails::Generators::TestCase end end - def test_api_generators_configuration_for_api_engines run_generator [destination_root, "--full", "--api"] diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb index d6bd281c53..84867dcdec 100644 --- a/railties/test/railties/engine_test.rb +++ b/railties/test/railties/engine_test.rb @@ -1226,7 +1226,6 @@ YAML end RUBY - app_file "config/routes.rb", <<-RUBY Rails.application.routes.draw do mount Bukkits::Engine => "/" @@ -1276,7 +1275,6 @@ YAML end RUBY - @plugin.write "app/controllers/bukkits/bukkit_controller.rb", <<-RUBY class Bukkits::BukkitController < ActionController::Base def index diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb index 37036db16d..9db42c0c38 100644 --- a/railties/test/railties/mounted_engine_test.rb +++ b/railties/test/railties/mounted_engine_test.rb @@ -34,7 +34,6 @@ module ApplicationTests end RUBY - @simple_plugin.write "lib/weblog.rb", <<-RUBY module Weblog class Engine < ::Rails::Engine @@ -239,7 +238,6 @@ module ApplicationTests get "/metrics/generate_blog_route_in_view", {}, "SCRIPT_NAME" => "/foo" assert_equal "/foo/anonymous/blog/posts/1", last_response.body - # test generating application's route from engine with default_url_options get "/someone/blog/generate_application_route", {}, "SCRIPT_NAME" => "/foo" assert_equal "/foo/", last_response.body |