From 30da9836773109b63485696c294b7e604e555e8e Mon Sep 17 00:00:00 2001
From: Aaron Spencer <aaron.spencer@softwire.com>
Date: Wed, 9 Aug 2023 14:14:49 +0100
Subject: [PATCH] CLDC-2505: Tests fixed and moved to correct controller spec

---
 .../bulk_upload_sales_resume_controller.rb    |  2 --
 ..._upload_lettings_resume_controller_spec.rb | 26 --------------
 ...ulk_upload_sales_resume_controller_spec.rb | 34 ++++++++++++-------
 3 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/app/controllers/bulk_upload_sales_resume_controller.rb b/app/controllers/bulk_upload_sales_resume_controller.rb
index 5096a4a34..9f937630d 100644
--- a/app/controllers/bulk_upload_sales_resume_controller.rb
+++ b/app/controllers/bulk_upload_sales_resume_controller.rb
@@ -41,8 +41,6 @@ private
                 Forms::BulkUploadSalesResume::Chosen.new(form_params.merge(bulk_upload: @bulk_upload))
               when "confirm"
                 Forms::BulkUploadSalesResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
-              when "completed"
-                Forms::BulkUploadSalesResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
               else
                 raise "invalid form"
               end
diff --git a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb
index bd89a49b2..ec265ab55 100644
--- a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb
+++ b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb
@@ -35,32 +35,6 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
     end
   end
 
-  describe "GET /sales-logs/bulk-upload-resume/:ID/start" do
-    context "when a choice has not been made" do
-      it "redirects to choice page" do
-        get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/start"
-
-        expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice")
-      end
-    end
-
-    context "when a choice has been made and then the logs have been completed" do
-      let(:sales_log) { create_list(:sales_log, 2, :completed, bulk_upload:) }
-
-
-      it "redirects to the complete page if the bulk uploads are completed" do
-        bulk_upload.update!(choice: "create-fix-inline")
-
-        get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/start"
-        follow_redirect!
-        expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/chosen")
-
-        follow_redirect!
-        expect(response.body).to include("You have created logs from your bulk upload, and the logs are complete. Return to sales logs to view them.")
-      end
-    end
-  end
-
   describe "GET /lettings-logs/bulk-upload-resume/:ID/fix-choice" do
     it "renders the page correctly" do
       get "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice"
diff --git a/spec/requests/bulk_upload_sales_resume_controller_spec.rb b/spec/requests/bulk_upload_sales_resume_controller_spec.rb
index 9c0a7112c..e7bcc9424 100644
--- a/spec/requests/bulk_upload_sales_resume_controller_spec.rb
+++ b/spec/requests/bulk_upload_sales_resume_controller_spec.rb
@@ -9,14 +9,6 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
     sign_in user
   end
 
-  describe "GET /sales-logs/bulk-upload-resume/:ID/start" do
-    it "redirects to choice page" do
-      get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/start"
-
-      expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice")
-    end
-  end
-
   describe "GET /sales-logs/bulk-upload-resume/:ID/fix-choice" do
     it "renders the page correctly" do
       get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice"
@@ -142,11 +134,29 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
     end
   end
 
-  describe "GET /sales-logs/bulk-upload-resume/:ID/chosen" do
-    it "displays correct content" do
-      get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/chosen"
+  describe "GET /sales-logs/bulk-upload-resume/:ID/start" do
+    context "when a choice has not been made" do
+      it "redirects to choice page" do
+        get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/start"
 
-      expect(response.body).to include("You need to fix logs from your bulk upload")
+        expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice")
+      end
+    end
+
+    context "when a choice has been made and then the logs have been completed" do
+      let(:sales_log) { create_list(:sales_log, 2, :completed, bulk_upload:) }
+
+
+      it "redirects to the complete page if the bulk uploads are completed" do
+        bulk_upload.update!(choice: "create-fix-inline")
+
+        get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/start"
+        follow_redirect!
+        expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/chosen")
+
+        follow_redirect!
+        expect(response.body).to include("You have created logs from your bulk upload, and the logs are complete. Return to sales logs to view them.")
+      end
     end
   end
 end