summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-03-20 08:06:39 +0000
committerazul <azul@riseup.net>2017-03-20 08:06:39 +0000
commitd7990f1b2af378ad071db6d94c5f95a50d6b7dcd (patch)
tree40726ee4b23d0de6f081cf4f87209d279b453704
parentb9d64784165d6fa0af305a7403ff70f5ca4f398b (diff)
parent74eb83587dd9c2e566e053cc0d33bb7aff517f01 (diff)
Merge branch 'bugfix/require-html-for-home-routes' into 'master'
bugfix: format: html for home roots See merge request !17
-rw-r--r--config/routes.rb7
-rw-r--r--test/integration/routes/no_route_test.rb17
2 files changed, 22 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index d388ab7..de328db 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,8 +3,11 @@ LeapWeb::Application.routes.draw do
# Please do not use root_path or root_url. Use home_path and home_url instead,
# so that the path will be correctly prefixed with the locale.
#
- root :to => "home#index"
- get '(:locale)' => 'home#index', :locale => CommonLanguages.match_available, :as => 'home'
+
+ scope format: 'html' do
+ root :to => "home#index"
+ get '(:locale)' => 'home#index', :locale => CommonLanguages.match_available, :as => 'home'
+ end
#
# HTTP Error Handling
diff --git a/test/integration/routes/no_route_test.rb b/test/integration/routes/no_route_test.rb
new file mode 100644
index 0000000..a570f85
--- /dev/null
+++ b/test/integration/routes/no_route_test.rb
@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class NoRouteTest < ActionDispatch::IntegrationTest
+
+ def test_path_with_dot
+ assert_no_route '.viminfo'
+ end
+
+ def assert_no_route(path, options = {})
+ options[:method] ||= :get
+ path = "/#{path}" unless path.first == "/"
+ params = @routes.recognize_path(path, method: :get)
+ flunk "Expected no route to '#{path}' but found: #{params.inspect}"
+ rescue ActionController::RoutingError
+ pass
+ end
+end