Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 8 deletions

diff --git a/spec/lib/gitlab/namespaced_session_store_spec.rb b/spec/lib/gitlab/namespaced_session_store_spec.rb
index 2c258ce3da6..4e9b35e6859 100644
--- a/spec/lib/gitlab/namespaced_session_store_spec.rb
+++ b/spec/lib/gitlab/namespaced_session_store_spec.rb
@@ -8,19 +8,28 @@ RSpec.describe Gitlab::NamespacedSessionStore do
   context 'current session' do
     subject { described_class.new(key) }
 
-    it 'stores data under the specified key' do
-      Gitlab::Session.with_session({}) do
-        subject[:new_data] = 123
-
-        expect(Thread.current[:session_storage][key]).to eq(new_data: 123)
-      end
-    end
-
     it 'retrieves data from the given key' do
       Thread.current[:session_storage] = { key => { existing_data: 123 } }
 
       expect(subject[:existing_data]).to eq 123
     end
+
+    context 'when namespace key does not exist' do
+      before do
+        Thread.current[:session_storage] = {}
+      end
+
+      it 'does not create namespace key when reading a value' do
+        expect(subject[:non_existent_key]).to eq(nil)
+        expect(Thread.current[:session_storage]).to eq({})
+      end
+
+      it 'stores data under the specified key' do
+        subject[:new_data] = 123
+
+        expect(Thread.current[:session_storage][key]).to eq(new_data: 123)
+      end
+    end
   end
 
   context 'passed in session' do