update confluence links (#975)

* update confluence links * Update spec/mailers/approve_request_mailer_spec.rb Co-authored-by: Jane Sandberg <sandbergja@users.noreply.github.com> * Update spec/mailers/approve_request_mailer_spec.rb Co-authored-by: Jane Sandberg <sandbergja@users.noreply.github.com> * fixing error with newline --------- Co-authored-by: Christina Chortaria <actspatial@gmail.com> Co-authored-by: Jane Sandberg <sandbergja@users.noreply.github.com> Co-authored-by: lizgarciao2 <lizg454545@gmail.com>
pulibrary · Jan 29, 2024 · 8d21590 · 8d21590
1 parent b618995
commit 8d21590
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/views/approve_mailer/creator_email.html.erb b/app/views/approve_mailer/creator_email.html.erb
@@ -16,7 +16,7 @@
           <p style="margin: 0 0 30px 0; font-family: sans-serif; font-size: 18px; line-height: 22px; color: #333333;">The following request was submitted by <%= @request.creator %> on <%= @request.formatted_created_at %>. <%= @request.latest_state_change_title %> <a href="<%= @request.show_path %>" style="text-decoration: underline; color: #333333;font-weight: bold;">Please review the full details of the request</a> on the Absence and Travel Request system.</p>
           <p style="margin: 0 0 30px 0; font-family: sans-serif; font-size: 18px; line-height: 22px; color: #333333;"><%= @request.forward_statement%></p>
           <% if @request.travel? %>
-           <p style="margin: 0 0 30px 0; font-family: sans-serif; font-size: 18px; line-height: 22px; color: #333333;">Your request has been assigned to <%= @request.travel_category%> travel category.  To find more information about Travel Categories <a href="https://lib-confluence.princeton.edu/display/LSC/Princeton+University+Library+Travel+Policy+and+Best+Practices">here</a></p>
+           <p style="margin: 0 0 30px 0; font-family: sans-serif; font-size: 18px; line-height: 22px; color: #333333;">Your request has been assigned to <%= @request.travel_category%> travel category.  To find more information about Travel Categories <a href="https://pul-confluence.atlassian.net/wiki/spaces/LSC/pages/1933321/Princeton+University+Library+Travel+Policy+and+Best+Practices">here</a></p>
           <% end %>
           <% if @request.request_type == 'AbsenceRequest' %>
             <h2>Do Not Forget!</h2>

diff --git a/app/views/approve_mailer/creator_email.text.erb b/app/views/approve_mailer/creator_email.text.erb
@@ -1,12 +1,12 @@
 The following request was submitted on <%= @request.formatted_created_at %>.  <%= @request.latest_state_change_title %>
 <%= @request.forward_statement %>
 <% if @request.travel? %>
-Your request has been assigned to <%= @request.travel_category%> travel category.  To find more information about Travel Categories see https://lib-confluence.princeton.edu/display/LSC/Princeton+University+Library+Travel+Policy+and+Best+Practices
+Your request has been assigned to <%= @request.travel_category%> travel category.  To find more information about Travel Categories see https://pul-confluence.atlassian.net/wiki/spaces/LSC/pages/1933321/Princeton+University+Library+Travel+Policy+and+Best+Practices
 <% end %>
 <% if @request.request_type == 'AbsenceRequest' %>
 Please proceed with recording your absence in the HR Self Service system (http://www.princeton.edu/hr/progserv/sds/applications/selfservice.html) as soon as possible. Your supervisor will be confirming that you have reported this information at the end of the month.
 <% end %>
 
 To view your request go to <%= @request.show_path %>
 
-<%= render "mailer/review_details", details: @request.approve_details %>
+<%= render "mailer/review_details", details: @request.approve_details %>
diff --git a/spec/mailers/approve_request_mailer_spec.rb b/spec/mailers/approve_request_mailer_spec.rb
@@ -79,7 +79,7 @@
       expect(mail.html_part.body.to_s).to have_content("The following request was submitted by Doe, Joe (jd4) on #{today_formatted}.")
       expect(mail.html_part.body.to_s).to have_content("Type\n    Vacation\n    Dates Away\n    12/30/2019 to 12/31/2019\n    Total absence time in hours\n    8.0\n")
       expect(mail.html_part.body).to have_selector("a[href=\"http://localhost:3000/absence_requests/#{absence_request.id}\"]")
-      expect(mail.text_part.body.to_s).to eq("The following request was submitted on #{today_formatted}.  It has been Approved by Jane Smith on #{today_formatted}.\n" \
+      expect(mail.text_part.body.to_s).to include("The following request was submitted on #{today_formatted}.  It has been Approved by Jane Smith on #{today_formatted}.\n" \
                                              "The approval has been forwarded to your supervisor and administrative assistant for their information.\n" \
                                              "Please proceed with recording your absence in the HR Self Service system (http://www.princeton.edu/hr/progserv/sds/applications/selfservice.html) " \
                                              "as soon as possible. Your supervisor will be confirming that you have reported this information at the end of the month.\n\n" \
@@ -115,10 +115,10 @@
       expect(mail.html_part.body.to_s).to have_content("Travel Category\n    #{decorated_travel_request.travel_category}\n    Trip ID\n    #{travel_request.id}\n    " \
                                                        "Type\n    Travel Request\n    Dates Away\n    12/30/2019 to 12/31/2019\n    Destination\n    Location\n")
       expect(mail.html_part.body).to have_selector("a[href=\"http://localhost:3000/travel_requests/#{travel_request.id}\"]")
-      expect(mail.text_part.body.to_s).to eq("The following request was submitted on #{today_formatted}.  It has been Approved by Jane Smith on #{today_formatted}.\n" \
+      expect(mail.text_part.body.to_s).to include("The following request was submitted on #{today_formatted}.  It has been Approved by Jane Smith on #{today_formatted}.\n" \
                                              "The approval has been forwarded to your supervisor and administrative assistant for their information.\n" \
                                              "Your request has been assigned to #{decorated_travel_request.travel_category} travel category.  " \
-                                             "To find more information about Travel Categories see https://lib-confluence.princeton.edu/display/LSC/Princeton+University+Library+Travel+Policy+and+Best+Practices\n\n"\
+                                             "To find more information about Travel Categories see https://pul-confluence.atlassian.net/wiki/spaces/LSC/pages/1933321/Princeton+University+Library+Travel+Policy+and+Best+Practices\n\n"\
                                              "To view your request go to http://localhost:3000/travel_requests/#{travel_request.id}\n\n" \
                                              "Travel Category: #{decorated_travel_request.travel_category}\nTrip ID: #{travel_request.id}\n" \
                                              "Type: Travel Request\nDates Away: 12/30/2019 to 12/31/2019\n" \
@@ -188,10 +188,10 @@
       expect(mail.html_part.body.to_s).to have_content("Travel Category\n    #{decorated_travel_request.travel_category}\n    Trip ID\n    #{travel_request.id}\n    " \
                                                        "Type\n    Travel Request\n    Dates Away\n    12/30/2019 to 12/31/2019\n    Destination\n    Location\n")
       expect(mail.html_part.body).to have_selector("a[href=\"http://localhost:3000/travel_requests/#{travel_request.id}\"]")
-      expect(mail.text_part.body.to_s).to eq("The following request was submitted on #{today_formatted}.  It has been Approved by Department Head on #{today_formatted}.\n" \
+      expect(mail.text_part.body.to_s).to include("The following request was submitted on #{today_formatted}.  It has been Approved by Department Head on #{today_formatted}.\n" \
                                              "The approval has been forwarded to your supervisor and administrative assistant for their information.\n" \
                                              "Your request has been assigned to #{decorated_travel_request.travel_category} travel category.  " \
-                                             "To find more information about Travel Categories see https://lib-confluence.princeton.edu/display/LSC/Princeton+University+Library+Travel+Policy+and+Best+Practices\n\n"\
+                                             "To find more information about Travel Categories see https://pul-confluence.atlassian.net/wiki/spaces/LSC/pages/1933321/Princeton+University+Library+Travel+Policy+and+Best+Practices\n\n"\
                                              "To view your request go to http://localhost:3000/travel_requests/#{travel_request.id}\n\n" \
                                              "Travel Category: #{decorated_travel_request.travel_category}\nTrip ID: #{travel_request.id}\n" \
                                              "Type: Travel Request\nDates Away: 12/30/2019 to 12/31/2019\n" \