From 5fc3900ac30f6b97cee80ffd480f1975177321b5 Mon Sep 17 00:00:00 2001
From: Kyle MacPherson <kaimac2010@gmail.com>
Date: Tue, 18 Jun 2024 11:07:54 +0100
Subject: [PATCH] Fix failing tests

---
 .../send_job_application_data_expiry_notifier_job_spec.rb | 8 ++++----
 spec/models/notification_spec.rb                          | 5 -----
 .../publishers/job_application_received_notifier_spec.rb  | 2 +-
 spec/requests/publishers/notifications_spec.rb            | 4 +++-
 4 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 spec/models/notification_spec.rb

diff --git a/spec/jobs/send_job_application_data_expiry_notifier_job_spec.rb b/spec/jobs/send_job_application_data_expiry_notifier_job_spec.rb
index 8fd7d36631..350f1fcd00 100644
--- a/spec/jobs/send_job_application_data_expiry_notifier_job_spec.rb
+++ b/spec/jobs/send_job_application_data_expiry_notifier_job_spec.rb
@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe SendJobApplicationDataExpiryNotifierJob do
-  let(:notification) { instance_double(Publishers::JobApplicationDataExpiryNotification) }
+  let(:notification) { instance_double(Publishers::JobApplicationDataExpiryNotifier) }
   let(:organisation) { create(:school) }
   let(:publisher) { create(:publisher, organisations: [organisation]) }
   let!(:vacancy) { create(:vacancy, expires_at: 351.days.ago, publisher: publisher, organisations: [organisation]) }
@@ -10,7 +10,7 @@
 
   context "when the vacancy has no job applications" do
     it "does not send notifications" do
-      expect(Publishers::JobApplicationDataExpiryNotification).not_to receive(:with).with(vacancy: vacancy, publisher: publisher)
+      expect(Publishers::JobApplicationDataExpiryNotifier).not_to receive(:with).with(vacancy: vacancy, publisher: publisher)
       described_class.perform_now
     end
   end
@@ -20,7 +20,7 @@
 
     context "when the vacancy expired 351 days ago" do
       it "sends notifications" do
-        expect(Publishers::JobApplicationDataExpiryNotification).to receive(:with).with(vacancy: vacancy, publisher: publisher).and_return(notification)
+        expect(Publishers::JobApplicationDataExpiryNotifier).to receive(:with).with(vacancy: vacancy, publisher: publisher).and_return(notification)
         expect(notification).to receive(:deliver).with(publisher)
         described_class.perform_now
       end
@@ -30,7 +30,7 @@
       let!(:vacancy) { create(:vacancy, expires_at: 1.day.ago, publisher: publisher, organisations: [organisation]) }
 
       it "does not send notifications" do
-        expect(Publishers::JobApplicationDataExpiryNotification).not_to receive(:with).with(vacancy: vacancy, publisher: publisher)
+        expect(Publishers::JobApplicationDataExpiryNotifier).not_to receive(:with).with(vacancy: vacancy, publisher: publisher)
         described_class.perform_now
       end
     end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
deleted file mode 100644
index dd67f796ad..0000000000
--- a/spec/models/notification_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Notification do
-  it { is_expected.to belong_to(:recipient) }
-end
diff --git a/spec/notifications/publishers/job_application_received_notifier_spec.rb b/spec/notifications/publishers/job_application_received_notifier_spec.rb
index 77c8db0d24..2be0bb678c 100644
--- a/spec/notifications/publishers/job_application_received_notifier_spec.rb
+++ b/spec/notifications/publishers/job_application_received_notifier_spec.rb
@@ -5,7 +5,7 @@
   let(:job_application) { create(:job_application, :status_submitted, vacancy: vacancy) }
 
   describe "#timestamp" do
-    subject { Notification.last.to_notification.timestamp }
+    subject { Noticed::Notification.last.timestamp }
 
     context "when the notification is delivered today" do
       before do
diff --git a/spec/requests/publishers/notifications_spec.rb b/spec/requests/publishers/notifications_spec.rb
index 409e35b0af..e22a7926b6 100644
--- a/spec/requests/publishers/notifications_spec.rb
+++ b/spec/requests/publishers/notifications_spec.rb
@@ -5,9 +5,10 @@
   let(:organisation) { build(:school) }
   let(:vacancy) { create(:vacancy, organisations: [organisation]) }
   let(:job_application) { create(:job_application, vacancy: vacancy) }
-  let!(:notification) { create(:notification, :job_application_received, recipient: publisher, params: { vacancy: vacancy, job_application: job_application }) }
+  # let!(:notification) { create(:notification, :job_application_received, recipient: publisher, params: { vacancy: vacancy, job_application: job_application }) }
 
   before do
+    Publishers::JobApplicationReceivedNotifier.with(vacancy: vacancy, job_application: job_application).deliver(publisher)
     allow_any_instance_of(Publishers::BaseController).to receive(:current_organisation).and_return(organisation)
     sign_in(publisher, scope: :publisher)
   end
@@ -18,6 +19,7 @@
     end
 
     it "marks notifications as read" do
+      notification = publisher.notifications.first
       freeze_time do
         expect { get publishers_notifications_path }.to change { notification.reload.read_at }.from(nil).to(Time.current)
       end