DEV: Add multisite tests (#207)

Author: angusmcleod

app/jobs/discourse_activity_pub_deliver.rb

@@ -34,6 +34,8 @@ def perform_request
       if request&.post_json_ld
         @delivered = true
       else
+        return if ENV["ACTIVITY_PUB_DISABLE_DELIVERY_RETRIES"]
+
         retry_count += 1
         return if retry_count > MAX_RETRY_COUNT
 

spec/integration/integration_cases_spec.rb

@@ -1,24 +1,9 @@
 # frozen_string_literal: true
 RSpec.describe "integration cases" do
-  def read_json(case_name, file_name)
-    JSON.parse(
-      File.open(
-        File.join(
-          File.expand_path("../..", __dir__),
-          "spec",
-          "fixtures",
-          "integration",
-          case_name,
-          "#{file_name}.json",
-        ),
-      ).read,
-    ).with_indifferent_access
-  end
-
   describe "#case 1" do
     let!(:actor) { Fabricate(:discourse_activity_pub_actor_group) }
     let!(:remote_actor) do
-      json = read_json("case_1", "group_actor")
+      json = read_integration_json("case_1", "group_actor")
       Fabricate(:discourse_activity_pub_actor_group, ap_id: json[:id], local: false)
     end
     let!(:follow) do
@@ -30,24 +15,24 @@ def read_json(case_name, file_name)
       Jobs.run_immediately!
       SiteSetting.activity_pub_require_signed_requests = false
 
-      stub_object_request(read_json("case_1", "group_actor"))
-      stub_object_request(read_json("case_1", "actor_1"))
-      stub_object_request(read_json("case_1", "actor_2"))
-      stub_object_request(read_json("case_1", "actor_3"))
-      stub_object_request(read_json("case_1", "actor_4"))
-      stub_object_request(read_json("case_1", "actor_5"))
-      stub_object_request(read_json("case_1", "context_1"))
+      stub_object_request(read_integration_json("case_1", "group_actor"))
+      stub_object_request(read_integration_json("case_1", "actor_1"))
+      stub_object_request(read_integration_json("case_1", "actor_2"))
+      stub_object_request(read_integration_json("case_1", "actor_3"))
+      stub_object_request(read_integration_json("case_1", "actor_4"))
+      stub_object_request(read_integration_json("case_1", "actor_5"))
+      stub_object_request(read_integration_json("case_1", "context_1"))
 
-      post_to_inbox(actor, body: read_json("case_1", "received_1"))
-      post_to_inbox(actor, body: read_json("case_1", "received_2"))
-      post_to_inbox(actor, body: read_json("case_1", "received_3"))
-      post_to_inbox(actor, body: read_json("case_1", "received_4"))
-      post_to_inbox(actor, body: read_json("case_1", "received_5"))
-      post_to_inbox(actor, body: read_json("case_1", "received_6"))
-      post_to_inbox(actor, body: read_json("case_1", "received_7"))
-      post_to_inbox(actor, body: read_json("case_1", "received_8"))
-      post_to_inbox(actor, body: read_json("case_1", "received_9"))
-      post_to_inbox(actor, body: read_json("case_1", "received_10"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_1"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_2"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_3"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_4"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_5"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_6"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_7"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_8"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_9"))
+      post_to_inbox(actor, body: read_integration_json("case_1", "received_10"))
     end
 
     it "creates the right Discourse objects" do
@@ -75,7 +60,7 @@ def read_json(case_name, file_name)
   describe "#case 2" do
     let!(:actor) { Fabricate(:discourse_activity_pub_actor_group) }
     let!(:remote_actor) do
-      json = read_json("case_2", "group_actor")
+      json = read_integration_json("case_2", "group_actor")
       Fabricate(:discourse_activity_pub_actor_group, ap_id: json[:id], local: false)
     end
     let!(:follow) do
@@ -87,22 +72,15 @@ def read_json(case_name, file_name)
       Jobs.run_immediately!
       SiteSetting.activity_pub_require_signed_requests = false
 
-      stub_object_request(read_json("case_2", "group_actor"))
-      stub_object_request(read_json("case_2", "actor_1"))
-      stub_object_request(read_json("case_2", "actor_2"))
-      stub_object_request(read_json("case_2", "actor_3"))
-      stub_object_request(read_json("case_2", "context_1"))
+      stub_object_request(read_integration_json("case_2", "group_actor"))
+      stub_object_request(read_integration_json("case_2", "actor_1"))
+      stub_object_request(read_integration_json("case_2", "actor_2"))
+      stub_object_request(read_integration_json("case_2", "actor_3"))
+      stub_object_request(read_integration_json("case_2", "context_1"))
 
-      threads = []
-      results = []
       6.times do |index|
-        threads << Thread.new do
-          post_to_inbox(actor, body: read_json("case_2", "received_#{index + 1}"))
-          results << response
-          sleep 0.01
-        end
+        post_to_inbox(actor, body: read_integration_json("case_2", "received_#{index + 1}"))
       end
-      threads.each(&:join)
     end
 
     it "creates the right Discourse objects" do

spec/multisite/activity_pub_multisite_spec.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+RSpec.describe "ActivityPub Multisite", type: :multisite do
+  before { Jobs.run_immediately! }
+
+  context "when processing" do
+    def fabricate_follow(actor)
+      remote_actor_json = read_integration_json("case_2", "group_actor")
+      remote_actor =
+        Fabricate(:discourse_activity_pub_actor_group, ap_id: remote_actor_json[:id], local: false)
+      Fabricate(:discourse_activity_pub_follow, follower: actor, followed: remote_actor)
+    end
+
+    def process_json(json, actor)
+      Jobs::DiscourseActivityPubProcess.new.execute(json: json, delivered_to: actor.ap_id)
+    end
+
+    def process_case(actor)
+      stub_object_request(read_integration_json("case_2", "group_actor"))
+      stub_object_request(read_integration_json("case_2", "actor_1"))
+      stub_object_request(read_integration_json("case_2", "actor_2"))
+      stub_object_request(read_integration_json("case_2", "actor_3"))
+      stub_object_request(read_integration_json("case_2", "context_1"))
+
+      6.times do |index|
+        process_json(read_integration_json("case_2", "received_#{index + 1}"), actor)
+      end
+    end
+
+    it "creates the right objects" do
+      test_multisite_connection("default") do
+        actor = Fabricate(:discourse_activity_pub_actor_group)
+        fabricate_follow(actor)
+        toggle_activity_pub(actor.model, publication_type: "full_topic")
+
+        process_case(actor)
+
+        posts = Post.all
+        topics = Topic.all
+        expect(posts.size).to eq(1)
+        expect(topics.size).to eq(1)
+        expect(posts.first.topic_id).to eq(topics.first.id)
+        expect(topics.first.category_id).to eq(actor.model.id)
+        expect(DiscourseActivityPubCollection.where(ap_type: "OrderedCollection").count).to eq(1)
+        expect(DiscourseActivityPubObject.where(ap_type: "Note").count).to eq(1)
+        expect(DiscourseActivityPubActor.where(ap_type: "Person").count).to eq(3)
+        expect(DiscourseActivityPubActivity.where(ap_type: "Announce").count).to eq(3)
+      end
+
+      test_multisite_connection("second") do
+        actor = Fabricate(:discourse_activity_pub_actor_group)
+        fabricate_follow(actor)
+        toggle_activity_pub(actor.model, publication_type: "full_topic")
+
+        process_case(actor)
+
+        posts = Post.all
+        topics = Topic.all
+        expect(posts.size).to eq(1)
+        expect(topics.size).to eq(1)
+        expect(posts.first.topic_id).to eq(topics.first.id)
+        expect(topics.first.category_id).to eq(actor.model.id)
+        expect(DiscourseActivityPubCollection.where(ap_type: "OrderedCollection").count).to eq(1)
+        expect(DiscourseActivityPubObject.where(ap_type: "Note").count).to eq(1)
+        expect(DiscourseActivityPubActor.where(ap_type: "Person").count).to eq(3)
+        expect(DiscourseActivityPubActivity.where(ap_type: "Announce").count).to eq(3)
+      end
+    end
+  end
+
+  context "when publishing" do
+    def fabricate_post(category)
+      topic = Fabricate(:topic, category: category)
+      Fabricate(:post, topic: topic)
+    end
+
+    def fabricate_follower(category)
+      follower = Fabricate(:discourse_activity_pub_actor_person)
+      Fabricate(
+        :discourse_activity_pub_follow,
+        follower: follower,
+        followed: category.activity_pub_actor,
+      )
+      follower
+    end
+
+    before { ENV["ACTIVITY_PUB_DISABLE_DELIVERY_RETRIES"] = "true" }
+    after { ENV.delete("ACTIVITY_PUB_DISABLE_DELIVERY_RETRIES") }
+
+    it "sends activities to followers" do
+      test_multisite_connection("default") do
+        category = Fabricate(:category)
+        toggle_activity_pub(category, publication_type: "full_topic")
+        follower = fabricate_follower(category)
+
+        expect_request(actor_id: category.activity_pub_actor.id, uri: follower.inbox)
+
+        post = fabricate_post(category)
+        post.activity_pub_publish!
+      end
+
+      test_multisite_connection("second") do
+        category = Fabricate(:category)
+        toggle_activity_pub(category, publication_type: "full_topic")
+        follower = fabricate_follower(category)
+
+        expect_request(actor_id: category.activity_pub_actor.id, uri: follower.inbox)
+
+        post = fabricate_post(category)
+        post.activity_pub_publish!
+      end
+    end
+  end
+end

spec/plugin_helper.rb

@@ -342,3 +342,17 @@ def teardown_logging
 def parsed_body
   JSON.parse(response.body)
 end
+
+def read_integration_json(case_name, file_name)
+  JSON.parse(
+    File.open(
+      File.join(
+        File.expand_path(__dir__),
+        "fixtures",
+        "integration",
+        case_name,
+        "#{file_name}.json",
+      ),
+    ).read,
+  ).with_indifferent_access
+end