Merge branch 'master' into 'update-import-export-docs'update-import-export-docs

# Conflicts:
#   doc/user/project/settings/import_export.md

1 files changed, 27 insertions, 0 deletions

diff --git a/spec/controllers/explore/projects_controller_spec.rb b/spec/controllers/explore/projects_controller_spec.rb
new file mode 100644
index 00000000000..9dceeca168d
--- /dev/null
+++ b/spec/controllers/explore/projects_controller_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Explore::ProjectsController do
+  describe 'GET #trending' do
+    context 'sorting by update date' do
+      let(:project1) { create(:empty_project, :public, updated_at: 3.days.ago) }
+      let(:project2) { create(:empty_project, :public, updated_at: 1.day.ago) }
+
+      before do
+        create(:trending_project, project: project1)
+        create(:trending_project, project: project2)
+      end
+
+      it 'sorts by last updated' do
+        get :trending, sort: 'updated_desc'
+
+        expect(assigns(:projects)).to eq [project2, project1]
+      end
+
+      it 'sorts by oldest updated' do
+        get :trending, sort: 'updated_asc'
+
+        expect(assigns(:projects)).to eq [project1, project2]
+      end
+    end
+  end
+end