Rambulanceを使って404/500/422ページを整備 #1702
+151
−125
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| module ErrorsHelper | ||
| def error_title(code) | ||
| case code | ||
| when 404 then "ページが見つかりませんでした... 🥺💦" | ||
| when 422 then "リクエストが処理できませんでした… 😢" | ||
| when 500 then "予期しないエラーが発生しました 😵💫" | ||
| else "予期せぬエラーが発生しました…😵" | ||
| end | ||
| end | ||
|
|
||
| def error_desc(code) | ||
| case code | ||
| when 404 then "ページが削除された可能性があります 🤔💭" | ||
| when 422 then "入力内容に誤りがあるか、リクエストが正しく送信されなかった可能性があります。" | ||
| when 500 then "申し訳ありません。サーバーで問題が発生しています。" | ||
| else "改善されない場合は、お手数ですがエラー報告をお願いいたします🙇♀️" | ||
| end | ||
| end | ||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1 @@ | ||
| <%= render template: "errors/show", locals: { status_code: 400 } %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1 @@ | ||
| <%= render template: "errors/show", locals: { status_code: 403 } %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| <%= render template: "errors/show", locals: { status_code: 500 } %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1 @@ | ||
| <%= render template: "errors/show", locals: { status_code: 404 } %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <%# The status_code local variable is passed from the parent template %> | ||
| <% title = error_title(status_code) %> | ||
| <% desc = error_desc(status_code) %> | ||
|
|
||
| <% provide(:title, title) %> | ||
| <% provide(:desc, desc) %> | ||
|
|
||
| <div id="top" class="title text-center"> | ||
| <i class="cd cd-logo"></i> | ||
| <h1>CoderDojo Japan</h1> | ||
| <p>子どものためのプログラミング道場</p> | ||
| <br> | ||
| </div> | ||
|
|
||
| <section class="introduction text-center list"> | ||
| <h2><%= title %></h2> | ||
| <p> | ||
| <%= desc %> | ||
| <br> | ||
| </p> | ||
| <p> | ||
| フィードバックなどあれば [email protected] にメールしていただくか、 | ||
| <br> | ||
| もしくは | ||
| <a href="https://github.com/coderdojo-japan/coderdojo.jp/issues/" target="_blank" rel="noopener"> | ||
| GitHub Issue | ||
| </a> | ||
| に書いていただけると嬉しいです (＞人＜ )✨ | ||
| </p> | ||
| </section> | ||
|
|
||
| <section id="timeline" class="text-center grayscale-bg" style="padding-bottom: 100px;"> | ||
| <br> | ||
| <h3 class="text-center"> | ||
| <a href="https://twitter.com/search?vertical=default&q=dojocon%20OR%20coderdojo%20OR%20%E3%82%B3%E3%83%BC%E3%83%80%E3%83%BC%E9%81%93%E5%A0%B4%20lang%3Aja" | ||
| target="_blank" rel="noopener"> | ||
| 🐣 最近の情報発信 | ||
| </a> | ||
| </h3> | ||
| <br> | ||
| <div class="twitter-timeline-wrapper"> | ||
| <a class="twitter-timeline" | ||
| href="https://twitter.com/CoderDojoJapan?ref_src=twsrc%5Etfw" | ||
| data-lang="ja" | ||
| data-chrome="noheader nofooter noborders" | ||
| data-dnt="true" | ||
| data-width="500" | ||
| data-tweet-limit="5"> | ||
| @CoderDojoJapan アカウントのタイムライン | ||
| </a> | ||
| </div> | ||
| <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script> | ||
| </section> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| <%= render template: "errors/show", locals: { status_code: 422 } %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,64 @@ | ||
| require 'rails_helper' | ||
|
|
||
| RSpec.describe 'Errors', type: :request do | ||
| include Rambulance::TestHelper | ||
| include ErrorsHelper | ||
|
|
||
| before do | ||
| # テスト用のルーティングを直接定義 | ||
| Rails.application.routes.draw do | ||
| get '/trigger_400', to: ->(env) { raise ActionController::BadRequest } | ||
| get '/trigger_422', to: ->(env) { raise ActionController::InvalidAuthenticityToken } | ||
| get '/trigger_500', to: ->(env) { raise 'This is a test 500 error' } | ||
| end | ||
|
|
||
| # ビューのレンダリングをスタブして、レイアウト起因のエラーを回避 | ||
| allow_any_instance_of(Rambulance::ExceptionsApp).to receive(:render).and_wrap_original do |m, *args| | ||
| options = args.last.is_a?(Hash) ? args.pop : {} | ||
| m.call(*args, **options.merge(layout: false)) | ||
| end | ||
| end | ||
|
|
||
| after do | ||
| # テスト後に追加したルーティングを元に戻す | ||
| Rails.application.reload_routes! | ||
| end | ||
|
|
||
| describe 'Error requests' do | ||
| it 'renders the 404 error page' do | ||
| with_exceptions_app do | ||
| # どのルーティングにもマッチしないパスをリクエスト | ||
| get '/does_not_exist' | ||
| end | ||
| expect(response.status).to eq(404) | ||
|
There was a problem hiding this comment. 「子どものためのプログラミング道場」など、必ず表示されるテキストが存在するかも確認しておくと、さらに安心できそうです👍 There was a problem hiding this comment. テストを追加しました🙌 |
||
| expect(response.body).to include(error_title(404)) | ||
| expect(response.body).to include(error_desc(404)) | ||
| end | ||
|
|
||
| it 'renders the 422 error page' do | ||
| with_exceptions_app do | ||
| get '/trigger_422' | ||
| end | ||
| expect(response.status).to eq(422) | ||
| expect(response.body).to include(error_title(422)) | ||
| expect(response.body).to include(error_desc(422)) | ||
| end | ||
|
|
||
| it 'renders the 500 error page' do | ||
| with_exceptions_app do | ||
| get '/trigger_500' | ||
| end | ||
| expect(response.status).to eq(500) | ||
| expect(response.body).to include(error_title(500)) | ||
| expect(response.body).to include(error_desc(500)) | ||
| end | ||
| it 'renders the 400 error page' do | ||
| with_exceptions_app do | ||
| get '/trigger_400' | ||
| end | ||
| expect(response.status).to eq(400) | ||
| expect(response.body).to include(error_title(400)) | ||
| expect(response.body).to include(error_desc(400)) | ||
| end | ||
| end | ||
| end | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rambulance提供のルートを利用する場合は、この定義も不要そうです👍