Apply batch upsert to all sitepress pages

Author: rossta

app/models/page.rb

@@ -44,12 +44,7 @@ def data = NullData.new(title: nil, description: nil)
   # the split personality for now.
   #
   def self.upsert_collection_from_sitepress!(limit: nil)
-    # Targeting specific Sitepress models until we have a better way to make
-    # Page model aware of published state
-    enum = [
-      SitepressArticle,
-      SitepressSlashPage
-    ].lazy.flat_map { |model| model.all.resources }
+    enum = SitepressPage.all.resources.lazy
 
     if limit
       enum = enum.filter do |sitepress_resource|
@@ -104,4 +99,8 @@ def meta_image = resource.data.meta_image
   def toc = resource.data.toc
 
   def enable_twitter_widgets = resource.data.toc
+
+  def upsert_page_from_sitepress!
+    self.class.upsert_page_from_sitepress!(resource)
+  end
 end

spec/jobs/pages/batch_upsert_pages_job_spec.rb

@@ -4,10 +4,7 @@
   it "creates pages for sitepress resources" do
     described_class.perform_now
 
-    expect(Page.count).to eq(
-      SitepressArticle.all.resources.size +
-      SitepressSlashPage.all.resources.size
-    )
+    expect(Page.count).to eq(SitepressPage.all.resources.size)
 
     expect(Page.pluck(:request_path)).to include("/articles/custom-color-schemes-with-ruby-on-rails")
   end

spec/system/articles_spec.rb

@@ -8,9 +8,8 @@
   end
 
   it "displays a single article" do
-    Page.upsert_collection_from_sitepress!(limit: 1)
+    article = FactoryBot.create(:page, :published, request_path: "/articles/custom-color-schemes-with-ruby-on-rails")
 
-    article = Page.first
     article.topics << FactoryBot.create_list(:topic, 2, :approved)
     article.topics << FactoryBot.create_list(:topic, 1, :pending)
     article.topics << FactoryBot.create_list(:topic, 1, :rejected)