Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 0 deletions

diff --git a/spec/views/events/event/_push.html.haml_spec.rb b/spec/views/events/event/_push.html.haml_spec.rb
index e43e37188a3..d33a8aa86fc 100644
--- a/spec/views/events/event/_push.html.haml_spec.rb
+++ b/spec/views/events/event/_push.html.haml_spec.rb
@@ -28,6 +28,23 @@ describe 'events/event/_push.html.haml' do
         expect(rendered).not_to have_link(event.ref_name)
       end
     end
+
+    context 'ref_count is more than 1' do
+      let(:payload) do
+        build_stubbed(
+          :push_event_payload,
+          event: event,
+          ref_count: 4,
+          ref_type: :branch
+        )
+      end
+
+      it 'includes the count in the text' do
+        render partial: 'events/event/push', locals: { event: event }
+
+        expect(rendered).to include('4 branches')
+      end
+    end
   end
 
   context 'with a tag' do
@@ -53,5 +70,22 @@ describe 'events/event/_push.html.haml' do
         expect(rendered).not_to have_link(event.ref_name)
       end
     end
+
+    context 'ref_count is more than 1' do
+      let(:payload) do
+        build_stubbed(
+          :push_event_payload,
+          event: event,
+          ref_count: 4,
+          ref_type: :tag
+        )
+      end
+
+      it 'includes the count in the text' do
+        render partial: 'events/event/push', locals: { event: event }
+
+        expect(rendered).to include('4 tags')
+      end
+    end
   end
 end