Merge pull request #5771 from nhsuk/alistair/standardise-batch-number

Standardise content to use "Batch number"

Author: alistair-white-horne-tng

app/components/app_vaccination_record_summary_component.rb

@@ -66,7 +66,7 @@ def call
         end
 
         summary_list.with_row do |row|
-          row.with_key { "Batch ID" }
+          row.with_key { "Batch number" }
 
           if @batch
             row.with_value(classes: ["app-u-code"]) { batch_id_value }

app/views/batches/new.html.erb

@@ -14,7 +14,7 @@
 <%= form_with model: @form, url: vaccine_batches_path(@vaccine), method: :post do |f| %>
   <% content_for(:before_content) { f.govuk_error_summary } %>
 
-  <%= f.govuk_text_field :name, label: { text: "Batch" }, width: 10, class: "nhsuk-input--code" %>
+  <%= f.govuk_text_field :name, label: { text: "Batch number" }, width: 10, class: "nhsuk-input--code" %>
 
   <%= f.govuk_date_field :expiry,
                          legend: { text: "Expiry date", size: "s" },

app/views/vaccines/index.html.erb

@@ -15,7 +15,7 @@
       <%= govuk_table do |table| %>
         <%= table.with_head do |head| %>
           <%= head.with_row do |row| %>
-            <%= row.with_cell(text: "Batch") %>
+            <%= row.with_cell(text: "Batch number") %>
             <%= row.with_cell(text: "Entered date") %>
             <%= row.with_cell(text: "Expiry date") %>
             <%= row.with_cell(text: "Actions") %>

spec/components/app_vaccination_record_summary_component_spec.rb

@@ -196,16 +196,21 @@
     end
   end
 
-  describe "batch ID row" do
-    it { should have_css(".nhsuk-summary-list__row", text: "Batch IDABC") }
+  describe "batch number row" do
+    it { should have_css(".nhsuk-summary-list__row", text: "Batch numberABC") }
 
     context "without a vaccine" do
       let(:outcome) { :unwell }
       let(:vaccine) { nil }
       let(:batch) { nil }
       let(:other_batch) { nil }
 
-      it { should_not have_css(".nhsuk-summary-list__row", text: "Batch ID") }
+      it do
+        expect(rendered).not_to have_css(
+          ".nhsuk-summary-list__row",
+          text: "Batch number"
+        )
+      end
     end
   end
 

spec/features/edit_vaccination_record_spec.rb

@@ -597,7 +597,7 @@ def and_i_choose_a_batch
   end
 
   def and_i_should_see_the_updated_batch
-    expect(page).to have_content("Batch ID#{@replacement_batch.name}")
+    expect(page).to have_content("Batch number#{@replacement_batch.name}")
   end
 
   def when_i_click_change_notes

spec/features/hpv_vaccination_administered_spec.rb

@@ -193,7 +193,7 @@ def then_i_see_the_patient_session_page
   def then_i_see_the_confirmation_page
     expect(page).to have_content("Check and confirm")
     expect(page).to have_content("Child#{@patient.full_name}")
-    expect(page).to have_content("Batch ID#{@active_batch.name}")
+    expect(page).to have_content("Batch number#{@active_batch.name}")
     expect(page).to have_content("MethodIntramuscular")
     expect(page).to have_content("SiteLeft arm")
     expect(page).to have_content("OutcomeVaccinated")

spec/features/hpv_vaccination_clinic_spec.rb

@@ -84,7 +84,7 @@ def and_i_select_a_location
   def then_i_see_the_confirmation_page
     expect(page).to have_content("Check and confirm")
     expect(page).to have_content("Child#{@patient.full_name}")
-    expect(page).to have_content("Batch ID#{@active_batch.name}")
+    expect(page).to have_content("Batch number#{@active_batch.name}")
     expect(page).to have_content("MethodIntramuscular")
     expect(page).to have_content("SiteLeft arm")
     expect(page).to have_content("OutcomeVaccinated")

spec/features/import_vaccination_records_with_duplicates_spec.rb

@@ -180,17 +180,17 @@ def when_i_review_the_first_duplicate_record
   end
 
   def then_i_should_see_the_first_duplicate_record
-    expect(page).to have_content("Batch ID123013325")
-    expect(page).to have_content("Batch IDSomethingElse")
+    expect(page).to have_content("Batch number123013325")
+    expect(page).to have_content("Batch numberSomethingElse")
     expect(page).to have_content("MethodIntramuscular")
     expect(page).to have_content("MethodNasal spray")
     expect(page).to have_content("SiteLeft thigh")
     expect(page).to have_content("SiteNose")
   end
 
   def then_i_should_see_the_second_duplicate_record
-    expect(page).to have_content("Batch ID123013325")
-    expect(page).to have_content("Batch IDCervarixBatch")
+    expect(page).to have_content("Batch number123013325")
+    expect(page).to have_content("Batch numberCervarixBatch")
     expect(page).to have_content("MethodNasal spray")
     expect(page).to have_content("SiteLeft arm (upper position)")
     expect(page).to have_content("SiteNose")

spec/features/manage_batches_spec.rb

@@ -62,7 +62,7 @@ def then_i_see_only_active_hpv_vaccines_with_no_batches_set_up
   def when_i_try_to_add_a_batch_with_an_invalid_expiry_date
     click_on "Add a new batch", match: :first
 
-    fill_in "Batch", with: "AB1234"
+    fill_in "Batch number", with: "AB1234"
 
     # expiry date
     fill_in "Day", with: "0"
@@ -120,7 +120,7 @@ def then_i_see_the_success_banner
   def when_i_add_the_archived_batch_again
     click_on "Add a new batch", match: :first
 
-    fill_in "Batch", with: "AB1234"
+    fill_in "Batch number", with: "AB1234"
 
     fill_in "Day", with: "31"
     fill_in "Month", with: "3"

spec/features/menacwy_vaccination_administered_spec.rb

@@ -118,7 +118,7 @@ def and_i_select_the_batch
   def then_i_see_the_confirmation_page
     expect(page).to have_content("Check and confirm")
     expect(page).to have_content("Child#{@patient.full_name}")
-    expect(page).to have_content("Batch ID#{@active_batch.name}")
+    expect(page).to have_content("Batch number#{@active_batch.name}")
     expect(page).to have_content("MethodIntramuscular")
     expect(page).to have_content("SiteLeft arm")
     expect(page).to have_content("OutcomeVaccinated")