Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,10 @@ class Application < Rails::Application
config.active_support.escape_html_entities_in_json = true
config.active_record.schema_format = :sql
config.active_record.observers = :user_observer

# config.time_zone は framework の初期化中に消費されるため、
# config/initializers 以下に書いても反映されない。ここに書く必要がある
config.time_zone = 'Tokyo'
config.i18n.default_locale = 'ja'
end
end
2 changes: 0 additions & 2 deletions config/initializers/time_zone_and_locale.rb

This file was deleted.

10 changes: 10 additions & 0 deletions spec/config/time_zone_and_locale_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

# config.time_zone は config/initializers 以下に書くと反映されないため、
# 設定が実際に効いていることを検証する
describe 'タイムゾーンとロケールの設定' do
it 'Time.zone が Tokyo、デフォルトロケールが ja になっている' do
expect(Time.zone.name).to eq 'Tokyo'
expect(I18n.default_locale).to eq :ja
end
end