Add latest changes from gitlab-org/gitlab@12-9-stable-ee

carlos-wong · May 13, 2020 · c5d5fcb · c5d5fcb
1 parent 8ce0cca
commit c5d5fcb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/spec/finders/protected_branches_finder_spec.rb b/spec/finders/protected_branches_finder_spec.rb
@@ -30,7 +30,7 @@
       end
 
       it 'returns limited protected branches of project' do
-        expect(subject).to eq([another_protected_branch])
+        expect(subject.count).to eq(1)
       end
     end
   end

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
@@ -5679,7 +5679,7 @@ def enable_lfs
     subject { project.limited_protected_branches(1) }
 
     it 'returns limited number of protected branches based on specified limit' do
-      expect(subject).to eq([another_protected_branch])
+      expect(subject.count).to eq(1)
     end
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ @@
           end
           it 'returns limited protected branches of project' do
-            expect(subject).to eq([another_protected_branch])
+            expect(subject.count).to eq(1)
           end
         end
       end
@@ Expand Down @@