From d8a9bfb6b7e17812915fe6767158abaca2ea6a74 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Thu, 5 Apr 2018 23:56:32 +0900
Subject: [PATCH] Order UsersController#projects.json by updated_at

---
 app/finders/personal_projects_finder.rb              |  2 +-
 .../unreleased/45065-users-projects-json-sort.yml    |  5 +++++
 .../users/user_browses_projects_on_user_page_spec.rb |  8 ++++----
 spec/finders/personal_projects_finder_spec.rb        | 12 +++++++-----
 4 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 changelogs/unreleased/45065-users-projects-json-sort.yml

diff --git a/app/finders/personal_projects_finder.rb b/app/finders/personal_projects_finder.rb
index 3ad4bd5f066..5aea0cb8192 100644
--- a/app/finders/personal_projects_finder.rb
+++ b/app/finders/personal_projects_finder.rb
@@ -13,7 +13,7 @@ class PersonalProjectsFinder < UnionFinder
   def execute(current_user = nil)
     segments = all_projects(current_user)
 
-    find_union(segments, Project).includes(:namespace).order_id_desc
+    find_union(segments, Project).includes(:namespace).order_updated_desc
   end
 
   private
diff --git a/changelogs/unreleased/45065-users-projects-json-sort.yml b/changelogs/unreleased/45065-users-projects-json-sort.yml
new file mode 100644
index 00000000000..89a1d7eb36f
--- /dev/null
+++ b/changelogs/unreleased/45065-users-projects-json-sort.yml
@@ -0,0 +1,5 @@
+---
+title: Order UsersController#projects.json by updated_at
+merge_request: 18227
+author: Takuya Noguchi
+type: other
diff --git a/spec/features/users/user_browses_projects_on_user_page_spec.rb b/spec/features/users/user_browses_projects_on_user_page_spec.rb
index a70637c8370..7bede0b0d48 100644
--- a/spec/features/users/user_browses_projects_on_user_page_spec.rb
+++ b/spec/features/users/user_browses_projects_on_user_page_spec.rb
@@ -27,8 +27,8 @@ describe 'Users > User browses projects on user page', :js do
   end
 
   it 'paginates projects', :js do
-    project = create(:project, namespace: user.namespace)
-    project2 = create(:project, namespace: user.namespace)
+    project = create(:project, namespace: user.namespace, updated_at: 2.minutes.since)
+    project2 = create(:project, namespace: user.namespace, updated_at: 1.minute.since)
     allow(Project).to receive(:default_per_page).and_return(1)
 
     sign_in(user)
@@ -41,11 +41,11 @@ describe 'Users > User browses projects on user page', :js do
 
     wait_for_requests
 
-    expect(page).to have_content(project2.name)
+    expect(page).to have_content(project.name)
 
     click_link('Next')
 
-    expect(page).to have_content(project.name)
+    expect(page).to have_content(project2.name)
   end
 
   context 'when not signed in' do
diff --git a/spec/finders/personal_projects_finder_spec.rb b/spec/finders/personal_projects_finder_spec.rb
index 5e52898e9c0..00c551a1f65 100644
--- a/spec/finders/personal_projects_finder_spec.rb
+++ b/spec/finders/personal_projects_finder_spec.rb
@@ -4,14 +4,16 @@ describe PersonalProjectsFinder do
   let(:source_user)     { create(:user) }
   let(:current_user)    { create(:user) }
   let(:finder)          { described_class.new(source_user) }
-  let!(:public_project) { create(:project, :public, namespace: source_user.namespace) }
+  let!(:public_project) do
+    create(:project, :public, namespace: source_user.namespace, updated_at: 1.hour.ago)
+  end
 
   let!(:private_project) do
-    create(:project, :private, namespace: source_user.namespace, path: 'mepmep')
+    create(:project, :private, namespace: source_user.namespace, updated_at: 3.hours.ago, path: 'mepmep')
   end
 
   let!(:internal_project) do
-    create(:project, :internal, namespace: source_user.namespace, path: 'C')
+    create(:project, :internal, namespace: source_user.namespace, updated_at: 2.hours.ago, path: 'C')
   end
 
   before do
@@ -28,7 +30,7 @@ describe PersonalProjectsFinder do
     subject { finder.execute(current_user) }
 
     context 'normal user' do
-      it { is_expected.to eq([internal_project, private_project, public_project]) }
+      it { is_expected.to eq([public_project, internal_project, private_project]) }
     end
 
     context 'external' do
@@ -36,7 +38,7 @@ describe PersonalProjectsFinder do
         current_user.update_attributes(external: true)
       end
 
-      it { is_expected.to eq([private_project, public_project]) }
+      it { is_expected.to eq([public_project, private_project]) }
     end
   end
 end