diff options
author | azul <azul@riseup.net> | 2017-03-20 10:21:56 +0000 |
---|---|---|
committer | azul <azul@riseup.net> | 2017-03-20 10:21:56 +0000 |
commit | 3fd52ccca46310c32ecfabb69b41630cb41dca7e (patch) | |
tree | 897a279db2be8dcebe77f45b84b8d9c500766a7d | |
parent | 15de288c3ca9bacc3d45675878ee7b8a2d9fc935 (diff) | |
parent | a741152e33f6a681113818418ad0f898f2d04697 (diff) |
Merge branch 'bugfix/404-for-missing-info' into 'master'
fix: 404 for missing pages template - fixes #9
Closes #9
See merge request !19
-rw-r--r-- | app/controllers/pages_controller.rb | 2 | ||||
-rw-r--r-- | test/integration/regression/key_discovery_test.rb (renamed from test/integration/key_discovery_test.rb) | 0 | ||||
-rw-r--r-- | test/integration/regression/provider_info_test.rb | 20 |
3 files changed, 22 insertions, 0 deletions
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index b9c601a..4508450 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -9,6 +9,8 @@ class PagesController < ApplicationController def show @show_navigation = false render page_name + rescue ActionView::MissingTemplate + raise ActionController::RoutingError.new('Not Found') end private diff --git a/test/integration/key_discovery_test.rb b/test/integration/regression/key_discovery_test.rb index 2a38a78..2a38a78 100644 --- a/test/integration/key_discovery_test.rb +++ b/test/integration/regression/key_discovery_test.rb diff --git a/test/integration/regression/provider_info_test.rb b/test/integration/regression/provider_info_test.rb new file mode 100644 index 0000000..2aaf6f6 --- /dev/null +++ b/test/integration/regression/provider_info_test.rb @@ -0,0 +1,20 @@ +require 'test_helper' + +class ProviderInfoTest < BrowserIntegrationTest + + def test_404_on_missing_page + visit '/about' + assert_equal 404, status_code + end + + def test_404_on_missing_language_page + visit '/de/about' + assert_equal 404, status_code + end + + def test_404_en_fallback + visit '/de/bye' + assert_equal 200, status_code + end + +end |