Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 3531c695236..b5ed29189fd 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -911,6 +911,16 @@ describe Group do
 
     subject { group.ci_variables_for('ref', project) }
 
+    it 'memoizes the result by ref', :request_store do
+      expect(project).to receive(:protected_for?).with('ref').once.and_return(true)
+      expect(project).to receive(:protected_for?).with('other').once.and_return(false)
+
+      2.times do
+        expect(group.ci_variables_for('ref', project)).to contain_exactly(ci_variable, protected_variable)
+        expect(group.ci_variables_for('other', project)).to contain_exactly(ci_variable)
+      end
+    end
+
     shared_examples 'ref is protected' do
       it 'contains all the variables' do
         is_expected.to contain_exactly(ci_variable, protected_variable)