Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 5 deletions

diff --git a/spec/controllers/explore/snippets_controller_spec.rb b/spec/controllers/explore/snippets_controller_spec.rb
index fa659c6df7f..ab91faa6cef 100644
--- a/spec/controllers/explore/snippets_controller_spec.rb
+++ b/spec/controllers/explore/snippets_controller_spec.rb
@@ -4,12 +4,33 @@ require 'spec_helper'
 
 describe Explore::SnippetsController do
   describe 'GET #index' do
-    it_behaves_like 'paginated collection' do
-      let(:collection) { Snippet.all }
+    let!(:project_snippet) { create_list(:project_snippet, 3, :public) }
+    let!(:personal_snippet) { create_list(:personal_snippet, 3, :public) }
 
-      before do
-        create(:personal_snippet, :public)
-      end
+    before do
+      allow(Kaminari.config).to receive(:default_per_page).and_return(2)
+    end
+
+    it 'renders' do
+      get :index
+
+      snippets = assigns(:snippets)
+
+      expect(snippets).to be_a(::Kaminari::PaginatableWithoutCount)
+      expect(snippets.size).to eq(2)
+      expect(snippets).to all(be_a(PersonalSnippet))
+      expect(response).to have_gitlab_http_status(:ok)
+    end
+
+    it 'renders pagination' do
+      get :index, params: { page: 2 }
+
+      snippets = assigns(:snippets)
+
+      expect(snippets).to be_a(::Kaminari::PaginatableWithoutCount)
+      expect(snippets.size).to eq(1)
+      expect(assigns(:snippets)).to all(be_a(PersonalSnippet))
+      expect(response).to have_gitlab_http_status(:ok)
     end
   end
 end