Merge pull request #7955 from fjordllc/feature/order-articles-by-publ…

…ished_at-desc

ブログ記事を published_at 順に並べる

app/controllers/articles_controller.rb

@@ -67,7 +67,8 @@ def set_article
   end
 
   def list_articles
-    articles = Article.with_attached_thumbnail.includes(user: { avatar_attachment: :blob }).order(created_at: :desc).page(params[:page])
+    articles = Article.with_attached_thumbnail.includes(user: { avatar_attachment: :blob })
+                      .order(published_at: :desc, created_at: :desc).page(params[:page])
     admin_or_mentor_login? ? articles : articles.where(wip: false)
   end
 

test/system/articles_test.rb

@@ -5,6 +5,7 @@
 class ArticlesTest < ApplicationSystemTestCase
   setup do
     @article = articles(:article1)
+    @article2 = articles(:article2)
     @article3 = articles(:article3)
   end
 
@@ -412,4 +413,11 @@ class ArticlesTest < ApplicationSystemTestCase
     visit '/articles.atom'
     assert_no_text 'WIPの記事は atom feed に表示されない'
   end
+
+  test 'WIP articles are listed first in desc order' do
+    visit_with_auth articles_path, 'komagata'
+    titles = all('h2.thumbnail-card__title').map(&:text)
+
+    assert_equal titles, ["WIP#{@article3.title}", @article2.title, @article.title]
+  end
 end