aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2017-02-12 03:50:51 -0800
committerGitHub <noreply@github.com>2017-02-12 03:50:51 -0800
commite4654aa93c3cf21949b72873072833b766ef7770 (patch)
tree033b466c6ea037e0dcd5513443fde63b79c278d7 /actionpack
parentb61a029782fb843eb30bec8f36784717fddc4ba8 (diff)
parent16ee3ccc9c7992269e69e9e809257d56c81ce174 (diff)
downloadrails-e4654aa93c3cf21949b72873072833b766ef7770.tar.gz
rails-e4654aa93c3cf21949b72873072833b766ef7770.tar.bz2
rails-e4654aa93c3cf21949b72873072833b766ef7770.zip
Merge pull request #27974 from kamipo/add_new_rubocop_rule
Add `Style/EmptyLinesAroundMethodBody` in `.rubocop.yml` and remove extra empty lines
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/test_case_test.rb1
-rw-r--r--actionpack/test/dispatch/reloader_test.rb1
-rw-r--r--actionpack/test/dispatch/runner_test.rb1
3 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index ac99830208..e084e45373 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -810,7 +810,6 @@ XML
new_content_type = "new content_type"
file.content_type = new_content_type
assert_equal new_content_type, file.content_type
-
end
def test_fixture_path_is_accessed_from_self_instead_of_active_support_test_case
diff --git a/actionpack/test/dispatch/reloader_test.rb b/actionpack/test/dispatch/reloader_test.rb
index 797430c85a..9eb78fe059 100644
--- a/actionpack/test/dispatch/reloader_test.rb
+++ b/actionpack/test/dispatch/reloader_test.rb
@@ -161,6 +161,5 @@ class ReloaderTest < ActiveSupport::TestCase
reloader.check = check
reloader
end
-
end
end
diff --git a/actionpack/test/dispatch/runner_test.rb b/actionpack/test/dispatch/runner_test.rb
index 969933c9ed..b76bf4a320 100644
--- a/actionpack/test/dispatch/runner_test.rb
+++ b/actionpack/test/dispatch/runner_test.rb
@@ -4,7 +4,6 @@ class RunnerTest < ActiveSupport::TestCase
test "runner preserves the setting of integration_session" do
runner = Class.new do
def before_setup
-
end
end.new