url is used more

Author: lydia-theda

app/controllers/abuse_reports_controller.rb

@@ -9,7 +9,7 @@ def new
       @abuse_report.email = reporter.email
       @abuse_report.username = reporter.login
     end
-    @abuse_report.referer = params[:referer] || request.env["HTTP_REFERER"]
+    @abuse_report.referer = params[:url] || request.env["HTTP_REFERER"]
   end
 
   def create
@@ -32,7 +32,7 @@ def load_abuse_languages
 
   def abuse_report_params
     params.require(:abuse_report).permit(
-      :username, :email, :language, :summary, :referer, :comment
+      :username, :email, :language, :summary, :url, :comment
     )
   end
 end

app/models/feedback_reporters/abuse_reporter.rb

@@ -14,7 +14,7 @@ def custom_zoho_fields
     # To avoid issues where Zoho ticket creation silently fails, only grab the first
     # 2080 characters of the referer URL. That may miss some complex search queries,
     # but still keep enough to be useful most of the time.
-    truncated_referer = referer.present? ? referer[0..2079] : ""
+    truncated_referer = url.present? ? url[0..2079] : ""
     {
       "cf_ip" => ip_address.presence || "Unknown IP",
       "cf_ticket_url" => truncated_referer

app/models/feedback_reporters/support_reporter.rb

@@ -16,7 +16,7 @@ def custom_zoho_fields
     # To avoid issues where Zoho ticket creation silently fails, only grab the first
     # 2080 characters of the referer URL. That may miss some complex search queries,
     # but still keep enough to be useful most of the time.
-    truncated_referer = referer.present? ? referer[0..2079] : ""
+    truncated_referer = url.present? ? url[0..2079] : ""
     {
       "cf_archive_version" => site_revision.presence || "Unknown site revision",
       "cf_rollout" => rollout.presence || "Unknown",

features/step_definitions/support_steps.rb

@@ -12,9 +12,9 @@
   allow(ArchiveConfig).to receive(:PERMITTED_HOSTS).and_return([host])
 end
 
-Then "a Zoho ticket should be created with referer {string}" do |referer|
+Then "a Zoho ticket should be created with url {string}" do |url|
   # rubocop:disable Lint/AmbiguousBlockAssociation
   expect(WebMock).to have_requested(:post, "https://desk.zoho.com/api/v1/tickets")
-    .with { |req| JSON.parse(req.body)["cf"]["cf_ticket_url"] == referer }
+    .with { |req| JSON.parse(req.body)["cf"]["cf_ticket_url"] == url }
   # rubocop:enable Lint/AmbiguousBlockAssociation
 end

spec/models/feedback_reporters/abuse_reporter_spec.rb

@@ -13,7 +13,7 @@
       email: "[email protected]",
       username: "Walrus",
       ip_address: "127.0.0.1",
-      referer: "https://example.com/works/1"
+      url: "https://example.com/works/1"
     }
   end
 
@@ -72,22 +72,22 @@
       end
     end
 
-    context "if the report has an empty referer" do
+    context "if the report has an empty URL" do
       before do
-        allow(subject).to receive(:referer).and_return("")
+        allow(subject).to receive(:url).and_return("")
       end
 
-      it "returns a hash containing a blank string for url" do
+      it "returns a hash containing a blank string for URL" do
         expect(subject.report_attributes.dig("cf", "cf_ticket_url")).to eq("")
       end
     end
 
-    context "if the reporter has a very long referer" do
+    context "if the reporter has a very long URL" do
       before do
-        allow(subject).to receive(:referer).and_return("a" * 2081)
+        allow(subject).to receive(:url).and_return("a" * 2081)
       end
 
-      it "truncates the referer to 2080 characters" do
+      it "truncates the URL to 2080 characters" do
         expect(subject.report_attributes.dig("cf", "cf_ticket_url").length).to eq(2080)
       end
     end

spec/models/feedback_reporters/support_reporter_spec.rb

@@ -16,7 +16,7 @@
       site_revision: "eternal_beta",
       rollout: "rollout_value",
       ip_address: "127.0.0.1",
-      referer: "https://example.com/works/1",
+      url: "https://example.com/works/1",
       site_skin: build(:skin, title: "Reversi", public: true)
     }
   end
@@ -114,22 +114,22 @@
       end
     end
 
-    context "if the report has an empty referer" do
+    context "if the report has an empty URL" do
       before do
-        allow(subject).to receive(:referer).and_return("")
+        allow(subject).to receive(:url).and_return("")
       end
 
-      it "returns a hash containing a blank string for referer" do
+      it "returns a hash containing a blank string for URL" do
         expect(subject.report_attributes.dig("cf", "cf_ticket_url")).to eq("")
       end
     end
 
-    context "if the reporter has a very long referer" do
+    context "if the reporter has a very long URL" do
       before do
-        allow(subject).to receive(:referer).and_return("a" * 2081)
+        allow(subject).to receive(:url).and_return("a" * 2081)
       end
 
-      it "truncates the referer to 2080 characters" do
+      it "truncates the URL to 2080 characters" do
         expect(subject.report_attributes.dig("cf", "cf_ticket_url").length).to eq(2080)
       end
     end