From 7c676dc7c22a0eca3391e981640320f2092636f2 Mon Sep 17 00:00:00 2001 From: YOSHIDA Hiroki Date: Tue, 18 Jun 2013 21:47:25 +0900 Subject: [PATCH] =?utf8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=BE=E3=83=BC?= =?utf8?q?=E3=83=B3=E3=81=BE=E3=82=8F=E3=82=8A=E3=81=8C=E5=AE=89=E5=AE=9A?= =?utf8?q?=E3=81=97=E3=81=A6=E3=83=86=E3=82=B9=E3=83=88=E3=81=AB=E9=80=9A?= =?utf8?q?=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/environment.rb | 3 ++- spec/controllers/admin/new_informations_controller_spec.rb | 4 ++-- spec/fixtures/product_styles.yml | 4 ++-- spec/models/questionnaire_spec.rb | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/environment.rb b/config/environment.rb index cb43a03..dcd1028 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -40,7 +40,8 @@ Rails::Initializer.run do |config| # Run "rake -D time" for a list of tasks for finding time zone names. #config.time_zone = 'UTC' #config.time_zone = 'Tokyo' - config.active_record.default_timezone = 'Tokyo' + config.time_zone = 'Tokyo' + config.active_record.default_timezone = :local # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')] diff --git a/spec/controllers/admin/new_informations_controller_spec.rb b/spec/controllers/admin/new_informations_controller_spec.rb index 72809b1..cf79d84 100644 --- a/spec/controllers/admin/new_informations_controller_spec.rb +++ b/spec/controllers/admin/new_informations_controller_spec.rb @@ -62,7 +62,7 @@ describe Admin::NewInformationsController do post 'confirm', :new_information => record get 'update', :new_information => record assigns[:new_information].id.should == new_informations(:success_validates_2).id - assigns[:new_information].date.should == DateTime.parse("2008-01-01") + assigns[:new_information].date.should == DateTime.parse("2008-01-01 00:00:00 +09:00") #assigns[:status].should == "confirm" response.should redirect_to(:action => :index) end @@ -74,7 +74,7 @@ describe Admin::NewInformationsController do post 'confirm', :new_information => record get 'update', :new_information => record assigns[:new_information].id.should == id - assigns[:new_information].date.should == DateTime.parse("2008-01-01") + assigns[:new_information].date.should == DateTime.parse("2008-01-01 00:00:00 +09:00") response.should_not be_redirect end end diff --git a/spec/fixtures/product_styles.yml b/spec/fixtures/product_styles.yml index 0491228..eb33423 100644 --- a/spec/fixtures/product_styles.yml +++ b/spec/fixtures/product_styles.yml @@ -142,8 +142,8 @@ valid_product: actual_count: 1000 sell_price: 10000 orderable_count: 100 - created_at: 2009-10-01 00:00:00 +09:00 - updated_at: 2009-10-01 00:00:00 +09:00 + created_at: <%= Date.new(2009, 10, 1) %> + updated_at: <%= Date.new(2009, 10, 1) %> #未公開商品 not_permit_product: diff --git a/spec/models/questionnaire_spec.rb b/spec/models/questionnaire_spec.rb index f5d1617..b9fdabf 100644 --- a/spec/models/questionnaire_spec.rb +++ b/spec/models/questionnaire_spec.rb @@ -159,7 +159,7 @@ describe Questionnaire do #更新時間について、 #questionnaire_answer.created_atとquestionnaire_answer[created_at]の結果が違うので特別処理 if "created_at" == c - arr << (qa.created_at.nil? ? "" : qa.created_at.strftime('%Y-%m-%dT%H:%M:%S+00:00')) + arr << (qa.created_at.nil? ? "" : qa.created_at.strftime('%Y-%m-%d %H:%M:%S')) else arr << (qa[c].nil? ? "" : qa[c].to_s) end -- 2.11.0