mirror of https://github.com/rails/rails
Create with_env helper for tests.
This commit is contained in:
parent
5686fd0ca1
commit
023d14ecbb
|
@ -60,36 +60,25 @@ class CacheKeyTest < ActiveSupport::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_expand_cache_key_with_rails_cache_id
|
def test_expand_cache_key_with_rails_cache_id
|
||||||
begin
|
with_env('RAILS_CACHE_ID' => 'c99') do
|
||||||
ENV['RAILS_CACHE_ID'] = 'c99'
|
|
||||||
assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
|
assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
|
||||||
assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
|
assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
|
||||||
assert_equal 'c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
|
assert_equal 'c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
|
||||||
assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key(:foo, :nm)
|
assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key(:foo, :nm)
|
||||||
assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
|
assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
|
||||||
assert_equal 'nm/c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
|
assert_equal 'nm/c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
|
||||||
ensure
|
|
||||||
ENV['RAILS_CACHE_ID'] = nil
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_expand_cache_key_with_rails_app_version
|
def test_expand_cache_key_with_rails_app_version
|
||||||
begin
|
with_env('RAILS_APP_VERSION' => 'rails3') do
|
||||||
ENV['RAILS_APP_VERSION'] = 'rails3'
|
|
||||||
assert_equal 'rails3/foo', ActiveSupport::Cache.expand_cache_key(:foo)
|
assert_equal 'rails3/foo', ActiveSupport::Cache.expand_cache_key(:foo)
|
||||||
ensure
|
|
||||||
ENV['RAILS_APP_VERSION'] = nil
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_expand_cache_key_rails_cache_id_should_win_over_rails_app_version
|
def test_expand_cache_key_rails_cache_id_should_win_over_rails_app_version
|
||||||
begin
|
with_env('RAILS_CACHE_ID' => 'c99', 'RAILS_APP_VERSION' => 'rails3') do
|
||||||
ENV['RAILS_CACHE_ID'] = 'c99'
|
|
||||||
ENV['RAILS_APP_VERSION'] = 'rails3'
|
|
||||||
assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
|
assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
|
||||||
ensure
|
|
||||||
ENV['RAILS_CACHE_ID'] = nil
|
|
||||||
ENV['RAILS_APP_VERSION'] = nil
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -124,6 +113,16 @@ class CacheKeyTest < ActiveSupport::TestCase
|
||||||
def test_expand_cache_key_of_array_like_object
|
def test_expand_cache_key_of_array_like_object
|
||||||
assert_equal 'foo/bar/baz', ActiveSupport::Cache.expand_cache_key(%w{foo bar baz}.to_enum)
|
assert_equal 'foo/bar/baz', ActiveSupport::Cache.expand_cache_key(%w{foo bar baz}.to_enum)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def with_env(kv)
|
||||||
|
old_values = {}
|
||||||
|
kv.each { |key, value| old_values[key], ENV[key] = ENV[key], value }
|
||||||
|
yield
|
||||||
|
ensure
|
||||||
|
old_values.each { |key, value| ENV[key] = value}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class CacheStoreSettingTest < ActiveSupport::TestCase
|
class CacheStoreSettingTest < ActiveSupport::TestCase
|
||||||
|
|
Loading…
Reference in New Issue