Merge branch 'next' into enable_dismiss_important_notices_for_archived_patients

Author: CodeCorvin

spec/fixtures/files/class_import/empty.csv

@@ -0,0 +1 @@
+PARENT_1_NAME,PARENT_1_RELATIONSHIP,PARENT_1_EMAIL,PARENT_1_PHONE,PARENT_2_NAME,PARENT_2_RELATIONSHIP,PARENT_2_EMAIL,PARENT_2_PHONE,CHILD_FIRST_NAME,CHILD_LAST_NAME,CHILD_PREFERRED_FIRST_NAME,CHILD_DATE_OF_BIRTH,CHILD_YEAR_GROUP,CHILD_ADDRESS_LINE_1,CHILD_ADDRESS_LINE_2,CHILD_TOWN,CHILD_POSTCODE,CHILD_REGISTRATION,CHILD_NHS_NUMBER

spec/fixtures/files/cohort_import/empty.csv

@@ -0,0 +1 @@
+CHILD_SCHOOL_URN,PARENT_1_NAME,PARENT_1_RELATIONSHIP,PARENT_1_EMAIL,PARENT_1_PHONE,PARENT_2_NAME,PARENT_2_RELATIONSHIP,PARENT_2_EMAIL,PARENT_2_PHONE,CHILD_FIRST_NAME,CHILD_LAST_NAME,CHILD_PREFERRED_GIVEN_NAME,CHILD_DATE_OF_BIRTH,CHILD_YEAR_GROUP,CHILD_ADDRESS_LINE_1,CHILD_ADDRESS_LINE_2,CHILD_TOWN,CHILD_POSTCODE,CHILD_NHS_NUMBER

spec/models/class_import_spec.rb

@@ -50,32 +50,6 @@
 
   it_behaves_like "a CSVImportable model"
 
-  describe "#load_data!" do
-    subject(:load_data!) { class_import.load_data! }
-
-    before { load_data! }
-
-    describe "with malformed CSV" do
-      let(:file) { "malformed.csv" }
-
-      it "is invalid" do
-        expect(class_import).to be_invalid
-        expect(class_import.errors[:csv]).to include(/correct format/)
-      end
-    end
-
-    describe "with too many rows" do
-      let(:file) { "valid.csv" }
-
-      before { stub_const("CSVImportable::MAX_CSV_ROWS", 2) }
-
-      it "is invalid" do
-        expect(class_import).to be_invalid
-        expect(class_import.errors[:csv]).to include(/less than 2 rows/)
-      end
-    end
-  end
-
   describe "#parse_rows!" do
     subject(:parse_rows!) { class_import.parse_rows! }
 

spec/models/cohort_import_spec.rb

@@ -48,32 +48,6 @@
 
   it_behaves_like "a CSVImportable model"
 
-  describe "#load_data!" do
-    subject(:load_data!) { cohort_import.load_data! }
-
-    before { load_data! }
-
-    describe "with malformed CSV" do
-      let(:file) { "malformed.csv" }
-
-      it "is invalid" do
-        expect(cohort_import).to be_invalid
-        expect(cohort_import.errors[:csv]).to include(/correct format/)
-      end
-    end
-
-    describe "with too many rows" do
-      let(:file) { "valid.csv" }
-
-      before { stub_const("CSVImportable::MAX_CSV_ROWS", 2) }
-
-      it "is invalid" do
-        expect(cohort_import).to be_invalid
-        expect(cohort_import.errors[:csv]).to include(/less than 2 rows/)
-      end
-    end
-  end
-
   describe "#parse_rows!" do
     subject(:parse_rows!) { cohort_import.parse_rows! }
 
@@ -153,28 +127,6 @@
         expect(cohort_import.errors.to_a[0]).to start_with("Row 2")
       end
     end
-
-    describe "with a valid file using ISO-8859-1 encoding" do
-      let(:file) { "valid_iso_8859_1_encoding.csv" }
-
-      let(:location) do
-        Location.find_by_urn_and_site("120026") ||
-          create(:gias_school, urn: "120026", team:)
-      end
-
-      it "is valid" do
-        expect(cohort_import).to be_valid
-        expect(cohort_import.rows.count).to eq(16)
-      end
-    end
-
-    describe "with an invalid file using ISO-8859-1 encoding" do
-      let(:file) { "invalid_iso_8859_1_encoding.csv" }
-
-      it "is invalid" do
-        expect(cohort_import).to be_invalid
-      end
-    end
   end
 
   describe "#process!" do

spec/models/immunisation_import_spec.rb

@@ -66,35 +66,6 @@
   describe "#load_data!" do
     before { immunisation_import.load_data! }
 
-    context "with malformed CSV" do
-      let(:file) { "malformed.csv" }
-
-      it "is invalid" do
-        expect(immunisation_import).to be_invalid
-        expect(immunisation_import.errors[:csv]).to include(/correct format/)
-      end
-    end
-
-    context "with empty CSV" do
-      let(:file) { "empty.csv" }
-
-      it "is invalid" do
-        expect(immunisation_import).to be_invalid
-        expect(immunisation_import.errors[:csv]).to include(/one record/)
-      end
-    end
-
-    context "with too many rows" do
-      let(:file) { "valid_flu.csv" }
-
-      before { stub_const("CSVImportable::MAX_CSV_ROWS", 2) }
-
-      it "is invalid" do
-        expect(immunisation_import).to be_invalid
-        expect(immunisation_import.errors[:csv]).to include(/less than 2 rows/)
-      end
-    end
-
     context "with a duplicated row" do
       let(:file) { "duplicate_row.csv" }
 

spec/support/shared_examples/a_csv_importable_model.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 shared_examples_for "a CSVImportable model" do
-  describe "validations" do
+  describe "#load_data!" do
+    before { subject.load_data! }
+
     it { should be_valid }
 
     it { should validate_presence_of(:csv_filename) }
@@ -20,6 +22,33 @@
         subject.update!(processed_at: Time.zone.now, status: :processed)
       }.to raise_error(/Count statistics must be set/)
     end
+
+    describe "with malformed CSV" do
+      let(:file) { "malformed.csv" }
+
+      it "is invalid" do
+        expect(subject).to be_invalid
+        expect(subject.errors[:csv]).to include(/correct format/)
+      end
+    end
+
+    describe "with too many rows" do
+      before { stub_const("CSVImportable::MAX_CSV_ROWS", 2) }
+
+      it "is invalid" do
+        expect(subject).to be_invalid
+        expect(subject.errors[:csv]).to include(/less than 2 rows/)
+      end
+    end
+
+    context "with empty CSV" do
+      let(:file) { "empty.csv" }
+
+      it "is invalid" do
+        expect(subject).to be_invalid
+        expect(subject.errors[:csv]).to include(/one record/)
+      end
+    end
   end
 
   describe "#csv=" do