diff --git a/app/models/support_ticket.rb b/app/models/support_ticket.rb index 5af34b14..94923dde 100644 --- a/app/models/support_ticket.rb +++ b/app/models/support_ticket.rb @@ -6,7 +6,6 @@ class SupportTicket def initialize(attributes) @subject = attributes.fetch(:subject, nil) @tags = attributes.fetch(:tags, nil) - @user_agent = attributes.fetch(:user_agent, nil) @description = attributes.fetch(:description, nil) end @@ -14,21 +13,13 @@ def attributes { "subject" => subject, "tags" => tags, - "body" => ticket_body, + "comment" => { + "body" => description, + }, } end private - attr_reader :subject, :tags, :user_agent, :description - - def ticket_body - <<-TICKET_BODY.strip_heredoc - [User agent] - #{user_agent} - - [Details] - #{description} - TICKET_BODY - end + attr_reader :subject, :tags, :description end diff --git a/spec/models/support_ticket_spec.rb b/spec/models/support_ticket_spec.rb index 219b72ab..6d408e30 100644 --- a/spec/models/support_ticket_spec.rb +++ b/spec/models/support_ticket_spec.rb @@ -21,20 +21,15 @@ support_ticket = described_class.new( subject: "Feedback for app", tags: %w[app_name], - user_agent: "Safari", description: "Ticket details go here.", ) expect(support_ticket.attributes).to eq( "subject" => "Feedback for app", "tags" => %w[app_name], - "body" => <<-TICKET_BODY.strip_heredoc, - [User agent] - Safari - - [Details] - Ticket details go here. - TICKET_BODY + "comment" => { + "body" => "Ticket details go here.", + }, ) end @@ -48,13 +43,9 @@ expect(support_ticket.attributes).to eq( "subject" => "Feedback for app", "tags" => %w[app_name], - "body" => <<-TICKET_BODY.strip_heredoc, - [User agent] - - - [Details] - Ticket details go here. - TICKET_BODY + "comment" => { + "body" => "Ticket details go here.", + }, ) end end diff --git a/spec/requests/support_tickets_spec.rb b/spec/requests/support_tickets_spec.rb index 129c3eea..f4fa22aa 100644 --- a/spec/requests/support_tickets_spec.rb +++ b/spec/requests/support_tickets_spec.rb @@ -8,7 +8,6 @@ params: { subject: "Feedback for app", tags: %w[app_name], - user_agent: "Safari", description: "Ticket details go here.", } @@ -20,20 +19,15 @@ zendesk_request = expect_zendesk_to_receive_ticket( "subject" => "Feedback for app", "tags" => %w[app_name], - "body" => <<-TICKET_BODY.strip_heredoc, - [User agent] - Safari - - [Details] - Ticket details go here. - TICKET_BODY + "comment" => { + "body" => "Ticket details go here.", + }, ) post "/support-tickets", params: { subject: "Feedback for app", tags: %w[app_name], - user_agent: "Safari", description: "Ticket details go here.", }