mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methods
Add lazy loading to #keys and #values methods in Session
This commit is contained in:
commit
cfd2eff46c
2 changed files with 20 additions and 0 deletions
|
@ -101,11 +101,13 @@ module ActionDispatch
|
|||
|
||||
# Returns keys of the session as Array.
|
||||
def keys
|
||||
load_for_read!
|
||||
@delegate.keys
|
||||
end
|
||||
|
||||
# Returns values of the session as Array.
|
||||
def values
|
||||
load_for_read!
|
||||
@delegate.values
|
||||
end
|
||||
|
||||
|
|
|
@ -54,6 +54,11 @@ module ActionDispatch
|
|||
assert_equal %w[rails adequate], s.keys
|
||||
end
|
||||
|
||||
def test_keys_with_deferred_loading
|
||||
s = Session.create(store_with_data, req, {})
|
||||
assert_equal %w[sample_key], s.keys
|
||||
end
|
||||
|
||||
def test_values
|
||||
s = Session.create(store, req, {})
|
||||
s["rails"] = "ftw"
|
||||
|
@ -61,6 +66,11 @@ module ActionDispatch
|
|||
assert_equal %w[ftw awesome], s.values
|
||||
end
|
||||
|
||||
def test_values_with_deferred_loading
|
||||
s = Session.create(store_with_data, req, {})
|
||||
assert_equal %w[sample_value], s.values
|
||||
end
|
||||
|
||||
def test_clear
|
||||
s = Session.create(store, req, {})
|
||||
s["rails"] = "ftw"
|
||||
|
@ -113,6 +123,14 @@ module ActionDispatch
|
|||
def delete_session(env, id, options); 123; end
|
||||
}.new
|
||||
end
|
||||
|
||||
def store_with_data
|
||||
Class.new {
|
||||
def load_session(env); [1, { "sample_key" => "sample_value" }]; end
|
||||
def session_exists?(env); true; end
|
||||
def delete_session(env, id, options); 123; end
|
||||
}.new
|
||||
end
|
||||
end
|
||||
|
||||
class SessionIntegrationTest < ActionDispatch::IntegrationTest
|
||||
|
|
Loading…
Reference in a new issue