aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2016-08-07 11:48:29 +0200
committerGitHub <noreply@github.com>2016-08-07 11:48:29 +0200
commitfb98d2e57162876c0e1823a5357bc44a932d08b9 (patch)
tree2c3225f7698ef3f7b2556510136c64a58ecf7355 /actionpack/test/dispatch
parent0d12708f3967fe93c172b30bd3e98e4433761c36 (diff)
parent762e3f05f3d372cb32570db0deeef27232c4dd00 (diff)
downloadrails-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 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/request_id_test.rb1
-rw-r--r--actionpack/test/dispatch/request_test.rb1
-rw-r--r--actionpack/test/dispatch/routing/inspector_test.rb1
-rw-r--r--actionpack/test/dispatch/static_test.rb1
4 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index 793ce67db4..4fcd45acf5 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -50,7 +50,6 @@ class RequestIdResponseTest < ActionDispatch::IntegrationTest
end
end
-
private
def with_test_route_set
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 0cac971daa..0dc8a2508e 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -1069,7 +1069,6 @@ class RequestParameters < BaseRequestTest
end
end
-
class RequestParameterFilter < BaseRequestTest
test "process parameter filter" do
test_hashes = [
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index 115770b7cd..97137a4762 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -338,7 +338,6 @@ module ActionDispatch
" DELETE /admin/posts/:id(.:format) admin/posts#destroy"], output
end
-
def test_regression_route_with_controller_regexp
output = draw do
ActiveSupport::Deprecation.silence do
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 404cc00cd1..e8f0ce21e9 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -82,7 +82,6 @@ module StaticTests
assert_html "means hello in Japanese\n", get("/foo/#{Rack::Utils.escape("こんにちは.html")}")
end
-
def test_serves_static_file_with_exclamation_mark_in_filename
with_static_file "/foo/foo!bar.html" do |file|
assert_html file, get("/foo/foo%21bar.html")