diff options
author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-04 16:22:24 +1100 |
---|---|---|
committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-04 16:22:40 +1100 |
commit | 58defe7a49eda51676ffaa34ccf2b267d0e62159 (patch) | |
tree | f510d276e31f86abecab98d44282e1521c6916a0 /spec/spec_helper.rb | |
parent | c9c599daacc54dcba508fa5868e3aef928b5670d (diff) | |
parent | 185c09f98dc670881239ecd230e47fb2f214e53b (diff) |
Merge remote-tracking branch 'mysociety/develop' into rails-3-spike
Conflicts:
Gemfile.lock
Rakefile
app/controllers/request_controller.rb
lib/tasks/rspec.rake
spec/controllers/services_controller_spec.rb
spec/spec_helper.rb
spec/views/request/_after_actions.rhtml_spec.rb
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0e0eebb6e..8343b8c22 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -76,3 +76,17 @@ def get_fixtures_xapian_index() ActsAsXapian.db_path = temp_path end +def with_env_tz(new_tz = 'US/Eastern') + old_tz, ENV['TZ'] = ENV['TZ'], new_tz + yield +ensure + old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ') +end + +def with_active_record_default_timezone(zone) + old_zone, ActiveRecord::Base.default_timezone = ActiveRecord::Base.default_timezone, zone + yield +ensure + ActiveRecord::Base.default_timezone = old_zone +end + |