From 2d50657f31e15785304b460794e6709b1660443d Mon Sep 17 00:00:00 2001
From: Aaron Spencer <aaron.spencer@softwire.com>
Date: Mon, 12 Jun 2023 14:23:18 +0100
Subject: [PATCH] CLDC-2328: Testing of sent emails

---
 app/models/user.rb         |  4 ----
 spec/features/user_spec.rb | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 1b414a25e..7c86d8796 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -109,11 +109,7 @@ class User < ApplicationRecord
   end
 
   def was_migrated_from_softwire?
-    let l = legacy_users
-    let y = old_user_id
-    let x = 1
     legacy_users.any? || old_user_id.present?
-
   end
 
   def send_confirmation_instructions
diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb
index f9eeba34c..ad24bdfb8 100644
--- a/spec/features/user_spec.rb
+++ b/spec/features/user_spec.rb
@@ -453,21 +453,21 @@ RSpec.describe "User Features" do
       end
     end
 
-    context "when reinviting a user" do
-      let!(:other_user) { FactoryBot.create(:user, name: "new user", is_dpo: false, organisation: user.organisation, email: "new_user@example.com") }
+    context "when reinviting a user after initial confirmation email has been sent" do
+      let!(:other_user) { FactoryBot.create(:user, name: "new user", organisation: user.organisation, email: "new_user@example.com", initial_confirmation_sent: true) }
 
       let(:personalisation) do
         {
           name: "new user",
           email: "new_user@example.com",
           organisation: other_user.organisation.name,
-          link: include("/account/confirmation?confirmation_token="),
+          link: include("/account/confirmation?confirmation_token=#{other_user.confirmation_token}"),
         }
       end
 
       before do
         other_user.update!(confirmation_token: "abc")
-        visit("/lettings-logs")
+        visit(lettings_logs_path)
         fill_in("user[email]", with: user.email)
         fill_in("user[password]", with: "pAssword1")
         click_button("Sign in")
@@ -475,10 +475,17 @@ RSpec.describe "User Features" do
       end
 
       it "sends and email when the resend invite link is clicked" do
-        visit("users/#{other_user.id}/")
+        other_user.legacy_users.destroy_all
+        visit(user_path(other_user))
         expect(notify_client).to receive(:send_email).with(email_address: "new_user@example.com", template_id: User::RECONFIRMABLE_TEMPLATE_ID, personalisation:).once
         click_link("Resend invite link")
       end
+
+      it "sends beta onboarding email to be sent when user is legacy" do
+        visit(user_path(other_user))
+        expect(notify_client).to receive(:send_email).with(email_address: "new_user@example.com", template_id: User::BETA_ONBOARDING_TEMPLATE_ID, personalisation:).once
+        click_link("Resend invite link")
+      end
     end
   end