Prefer to_json over JSON.generate when simple strings in stub request (mastodon#38258)

Author: mjankowski

spec/lib/activitypub/activity/announce_spec.rb

@@ -35,7 +35,7 @@
     context 'when sender is followed by a local account' do
       before do
         Fabricate(:account).follow!(sender)
-        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: JSON.generate(unknown_object_json), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: unknown_object_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
         subject.perform
       end
 
@@ -120,7 +120,7 @@
       let(:object_json) { 'https://example.com/actor/hello-world' }
 
       before do
-        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: JSON.generate(unknown_object_json), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: unknown_object_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
       end
 
       context 'when the relay is enabled' do

spec/lib/activitypub/activity/create_spec.rb

@@ -1028,8 +1028,8 @@ def activity_for_object(json)
           )
         end
 
-        before do
-          stub_request(:get, approval_uri).to_return(headers: { 'Content-Type': 'application/activity+json' }, body: JSON.generate({
+        let(:quote_authorization_json) do
+          {
             '@context': [
               'https://www.w3.org/ns/activitystreams',
               {
@@ -1054,7 +1054,11 @@ def activity_for_object(json)
             attributedTo: ActivityPub::TagManager.instance.uri_for(quoted_status.account),
             interactingObject: object_json[:id],
             interactionTarget: ActivityPub::TagManager.instance.uri_for(quoted_status),
-          }))
+          }
+        end
+
+        before do
+          stub_request(:get, approval_uri).to_return(headers: { 'Content-Type': 'application/activity+json' }, body: quote_authorization_json.to_json)
         end
 
         it 'creates a status with a verified quote' do
@@ -1084,8 +1088,8 @@ def activity_for_object(json)
           )
         end
 
-        before do
-          stub_request(:get, approval_uri).to_return(headers: { 'Content-Type': 'application/activity+json' }, body: JSON.generate({
+        let(:quote_authorization_json) do
+          {
             '@context': [
               'https://www.w3.org/ns/activitystreams',
               {
@@ -1110,7 +1114,11 @@ def activity_for_object(json)
             attributedTo: ActivityPub::TagManager.instance.uri_for(quoted_status.account),
             interactingObject: object_json[:id],
             interactionTarget: ActivityPub::TagManager.instance.uri_for(quoted_status),
-          }))
+          }
+        end
+
+        before do
+          stub_request(:get, approval_uri).to_return(headers: { 'Content-Type': 'application/activity+json' }, body: quote_authorization_json.to_json)
         end
 
         it 'creates a status without the verified quote' do
@@ -1217,7 +1225,7 @@ def activity_for_object(json)
       before do
         stub_request(:get, object_json[:id])
           .with(headers: { Authorization: "Bearer #{token}" })
-          .to_return(body: JSON.generate(object_json), headers: { 'Content-Type': 'application/activity+json' })
+          .to_return(body: object_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
 
         subject.perform
       end

spec/lib/activitypub/activity/quote_request_spec.rb

@@ -86,7 +86,7 @@
 
     context 'when trying to quote a quotable local status' do
       before do
-        stub_request(:get, 'https://example.com/unknown-status').to_return(status: 200, body: JSON.generate(status_json), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://example.com/unknown-status').to_return(status: 200, body: status_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
         quoted_post.update(quote_approval_policy: InteractionPolicy::POLICY_FLAGS[:public] << 16)
       end
 

spec/lib/activitypub/activity_spec.rb

@@ -89,7 +89,7 @@
     before do
       sender.update(uri: ActivityPub::TagManager.instance.uri_for(sender))
 
-      stub_request(:get, approval_uri).to_return(headers: { 'Content-Type': 'application/activity+json' }, body: JSON.generate(approval_payload))
+      stub_request(:get, approval_uri).to_return(headers: { 'Content-Type': 'application/activity+json' }, body: approval_payload.to_json)
     end
 
     context 'when getting them in order' do

spec/lib/activitypub/dereferencer_spec.rb

@@ -12,7 +12,7 @@
     let(:uri) { nil }
 
     before do
-      stub_request(:get, 'https://example.com/foo').to_return(body: JSON.generate(object), headers: { 'Content-Type' => 'application/activity+json' })
+      stub_request(:get, 'https://example.com/foo').to_return(body: object.to_json, headers: { 'Content-Type' => 'application/activity+json' })
     end
 
     context 'with a URI' do

spec/lib/activitypub/forwarder_spec.rb

@@ -54,8 +54,8 @@
 
     it 'correctly forwards to expected remote followers' do
       expect { subject.forward! }
-        .to enqueue_sidekiq_job(ActivityPub::LowPriorityDeliveryWorker).with(JSON.generate(payload), anything, eve.preferred_inbox_url)
-        .and enqueue_sidekiq_job(ActivityPub::LowPriorityDeliveryWorker).with(JSON.generate(payload), anything, mallory.preferred_inbox_url)
+        .to enqueue_sidekiq_job(ActivityPub::LowPriorityDeliveryWorker).with(payload.to_json, anything, eve.preferred_inbox_url)
+        .and enqueue_sidekiq_job(ActivityPub::LowPriorityDeliveryWorker).with(payload.to_json, anything, mallory.preferred_inbox_url)
     end
   end
 end

spec/lib/mastodon/cli/domains_spec.rb

@@ -87,7 +87,7 @@
         end
 
         def json_summary
-          JSON.generate('host.example': { activity: {} })
+          { 'host.example': { activity: {} } }.to_json
         end
       end
     end

spec/lib/webhooks/payload_renderer_spec.rb

@@ -3,27 +3,34 @@
 require 'rails_helper'
 
 RSpec.describe Webhooks::PayloadRenderer do
-  subject(:renderer) { described_class.new(json) }
+  subject(:renderer) { described_class.new(payload.to_json) }
 
   let(:event)   { Webhooks::EventPresenter.new(type, object) }
   let(:payload) { ActiveModelSerializers::SerializableResource.new(event, serializer: REST::Admin::WebhookEventSerializer, scope: nil, scope_name: :current_user).as_json }
-  let(:json)    { JSON.generate(payload) }
 
   describe '#render' do
+    subject { renderer.render(template) }
+
     context 'when event is account.approved' do
       let(:type)   { 'account.approved' }
-      let(:object) { Fabricate(:account, display_name: 'Foo"') }
+      let(:object) { Fabricate(:account, display_name: 'Foo"', username: 'foofoobarbar') }
+
+      context 'with event-related variables' do
+        let(:template) { 'foo={{event}}' }
 
-      it 'renders event-related variables into template' do
-        expect(renderer.render('foo={{event}}')).to eq 'foo=account.approved'
+        it { is_expected.to eq('foo=account.approved') }
       end
 
-      it 'renders event-specific variables into template' do
-        expect(renderer.render('foo={{object.username}}')).to eq "foo=#{object.username}"
+      context 'with event-specific variables' do
+        let(:template) { 'foo={{object.username}}' }
+
+        it { is_expected.to eq('foo=foofoobarbar') }
       end
 
-      it 'escapes values for use in JSON' do
-        expect(renderer.render('foo={{object.account.display_name}}')).to eq 'foo=Foo\\"'
+      context 'with values needing JSON escape' do
+        let(:template) { 'foo={{object.account.display_name}}' }
+
+        it { is_expected.to eq('foo=Foo\\"') }
       end
     end
   end

spec/requests/api/v1/donation_campaigns_spec.rb

@@ -91,7 +91,7 @@
         end
 
         before do
-          stub_request(:get, "#{api_url}?platform=web&seed=#{seed}&locale=en").to_return(body: JSON.generate(campaign_json), status: 200)
+          stub_request(:get, "#{api_url}?platform=web&seed=#{seed}&locale=en").to_return(body: campaign_json.to_json, status: 200)
         end
 
         it 'returns the expected campaign' do

spec/services/activitypub/fetch_featured_collection_service_spec.rb

@@ -75,11 +75,11 @@
 
     shared_examples 'sets pinned posts' do
       before do
-        stub_request(:get, 'https://example.com/account/pinned/known').to_return(status: 200, body: JSON.generate(status_json_pinned_known), headers: { 'Content-Type': 'application/activity+json' })
-        stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: JSON.generate(status_json_pinned_unknown_inlined), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://example.com/account/pinned/known').to_return(status: 200, body: status_json_pinned_known.to_json, headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: status_json_pinned_unknown_inlined.to_json, headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/account/pinned/unknown-unreachable').to_return(status: 404)
-        stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: JSON.generate(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
-        stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: JSON.generate(featured_with_null), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: status_json_pinned_unknown_reachable.to_json, headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: featured_with_null.to_json, headers: { 'Content-Type': 'application/activity+json' })
 
         subject
       end
@@ -101,7 +101,7 @@
         let(:collection_or_uri) { actor.featured_collection_url }
 
         before do
-          stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: JSON.generate(payload), headers: { 'Content-Type': 'application/activity+json' })
+          stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: payload.to_json, headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it_behaves_like 'sets pinned posts'
@@ -122,7 +122,7 @@
 
     context 'when the endpoint is a Collection' do
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: JSON.generate(payload), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: payload.to_json, headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
@@ -139,7 +139,7 @@
       end
 
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: JSON.generate(payload), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: payload.to_json, headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
@@ -148,11 +148,12 @@
         let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
 
         before do
-          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: JSON.generate(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
-          subject
+          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: status_json_pinned_unknown_reachable.to_json, headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it 'sets expected posts as pinned posts' do
+          subject
+
           expect(actor.pinned_statuses.pluck(:uri)).to contain_exactly(
             'https://example.com/account/pinned/unknown-reachable'
           )
@@ -175,7 +176,7 @@
       end
 
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: JSON.generate(payload), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: payload.to_json, headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
@@ -184,11 +185,12 @@
         let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
 
         before do
-          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: JSON.generate(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
-          subject
+          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: status_json_pinned_unknown_reachable.to_json, headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it 'sets expected posts as pinned posts' do
+          subject
+
           expect(actor.pinned_statuses.pluck(:uri)).to contain_exactly(
             'https://example.com/account/pinned/unknown-reachable'
           )