Add latest changes from gitlab-org/gitlab@master

1 files changed, 28 insertions, 0 deletions

diff --git a/spec/initializers/attr_encrypted_thread_safe_spec.rb b/spec/initializers/attr_encrypted_thread_safe_spec.rb
new file mode 100644
index 00000000000..096b8b196b4
--- /dev/null
+++ b/spec/initializers/attr_encrypted_thread_safe_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe AttrEncrypted do
+  describe '#encrypted_attributes' do
+    subject do
+      Class.new(ActiveRecord::Base) do
+        self.table_name = 'projects'
+
+        attr_accessor :encrypted_foo
+        attr_accessor :encrypted_foo_iv
+
+        attr_encrypted :foo, key: 'This is a key that is 256 bits!!'
+      end
+    end
+
+    it 'does not share state with other instances' do
+      instance = subject.new
+      instance.foo = 'bar'
+
+      another_instance = subject.new
+
+      expect(instance.encrypted_attributes[:foo][:operation]).to eq(:encrypting)
+      expect(another_instance.encrypted_attributes[:foo][:operation]).to be_nil
+    end
+  end
+end