From 97d62bac693a8ee39a2840761ce9c30d01f8e32f Mon Sep 17 00:00:00 2001
From: Daniel Uber <djuber@gmail.com>
Date: Tue, 18 Jan 2022 10:32:48 -0600
Subject: [PATCH] Move basic feed test for blocked users (#16165)

---
 spec/services/articles/feeds/basic_spec.rb | 10 ---------
 spec/system/articles/feeds/basic_spec.rb   | 26 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 spec/system/articles/feeds/basic_spec.rb

diff --git a/spec/services/articles/feeds/basic_spec.rb b/spec/services/articles/feeds/basic_spec.rb
index faf65fb86..a0b12a7eb 100644
--- a/spec/services/articles/feeds/basic_spec.rb
+++ b/spec/services/articles/feeds/basic_spec.rb
@@ -45,15 +45,5 @@ RSpec.describe Articles::Feeds::Basic, type: :service do
       result = feed.feed
       expect(result).not_to include(hot_story)
     end
-
-    it "doesn't display blocked articles", type: :system, js: true do
-      selector = "article[data-content-user-id='#{hot_story.user_id}']"
-      sign_in user
-      visit root_path
-      expect(page).to have_selector(selector, visible: :visible)
-      create(:user_block, blocker: user, blocked: hot_story.user, config: "default")
-      visit root_path
-      expect(page).to have_selector(selector, visible: :hidden)
-    end
   end
 end
diff --git a/spec/system/articles/feeds/basic_spec.rb b/spec/system/articles/feeds/basic_spec.rb
new file mode 100644
index 000000000..daa6357fc
--- /dev/null
+++ b/spec/system/articles/feeds/basic_spec.rb
@@ -0,0 +1,26 @@
+require "rails_helper"
+
+RSpec.describe Articles::Feeds::Basic, type: :system, js: true do
+  let(:user) { create(:user) }
+  let(:hot_story) do
+    create(:article, hotness_score: 1000, score: 1000, published_at: 3.hours.ago)
+  end
+
+  before do
+    create(:article, hotness_score: 10)
+  end
+
+  context "with a user" do
+    let(:feed) { described_class.new(user: user, number_of_articles: 100, page: 1) }
+
+    it "doesn't display blocked articles", type: :system, js: true do
+      selector = "article[data-content-user-id='#{hot_story.user_id}']"
+      sign_in user
+      visit root_path
+      expect(page).to have_selector(selector, visible: :visible)
+      create(:user_block, blocker: user, blocked: hot_story.user, config: "default")
+      visit root_path
+      expect(page).to have_selector(selector, visible: :hidden)
+    end
+  end
+end