diff --git a/app/models/bulk_upload.rb b/app/models/bulk_upload.rb index 552f6fbeb..4dc1ae6a8 100644 --- a/app/models/bulk_upload.rb +++ b/app/models/bulk_upload.rb @@ -14,6 +14,7 @@ class BulkUpload < ApplicationRecord incomplete_logs = logs.where.not(status: "completed") !incomplete_logs.exists? end + def year_combo "#{year}/#{year - 2000 + 1}" end diff --git a/spec/models/bulk_upload_spec.rb b/spec/models/bulk_upload_spec.rb index 46a9d6cae..7943d7a6a 100644 --- a/spec/models/bulk_upload_spec.rb +++ b/spec/models/bulk_upload_spec.rb @@ -1,29 +1,23 @@ require "rails_helper" RSpec.describe BulkUpload, type: :model do -let(:bulk_upload) { create(:bulk_upload, log_type: "lettings") } + let(:bulk_upload) { create(:bulk_upload, log_type: "lettings") } -describe "completed?" do - context "when the fixed-choice has not been selected" do - it "returns false" do - end - end - - context "when there are incomplete logs" do - let!(:lettings_log) { create_list(:lettings_log, 2,:in_progress, bulk_upload:) } + describe "def bulk_upload.completed?" do + context "when there are incomplete logs" do + let!(:lettings_log) { create_list(:lettings_log, 2, :in_progress, bulk_upload:) } - it "returns false" do - expect(bulk_upload.completed?).to equal(false) + it "returns false" do + expect(bulk_upload.completed?).to equal(false) + end end - end - context "when there are no incomplete logs" do - let!(:lettings_log) { create_list(:lettings_log, 2, :completed, bulk_upload:) } + context "when there are no incomplete logs" do + let!(:lettings_log) { create_list(:lettings_log, 2, :completed, bulk_upload:) } - it "returns true" do - expect(bulk_upload.completed?).to equal(true) + it "returns true" do + expect(bulk_upload.completed?).to equal(true) + end end end - -end end diff --git a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb index ec265ab55..4c60cdb4d 100644 --- a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb +++ b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb @@ -21,7 +21,6 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do context "when a choice has been made and then the logs have been completed" do let(:lettings_log) { create_list(:lettings_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") diff --git a/spec/requests/bulk_upload_sales_resume_controller_spec.rb b/spec/requests/bulk_upload_sales_resume_controller_spec.rb index e7bcc9424..946950b9b 100644 --- a/spec/requests/bulk_upload_sales_resume_controller_spec.rb +++ b/spec/requests/bulk_upload_sales_resume_controller_spec.rb @@ -146,7 +146,6 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do 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")