Merge branch 'feature/displaying_registered_companys_name' of https:/…

…/github.com/DEFRA/waste-carriers-engine into feature/displaying_registered_companys_name

app/controllers/waste_carriers_engine/check_registered_company_name_forms_controller.rb

@@ -6,7 +6,6 @@ module WasteCarriersEngine
   class CheckRegisteredCompanyNameFormsController < ::WasteCarriersEngine::FormsController
     def new
       super(CheckRegisteredCompanyNameForm, "check_registered_company_name_form")
-      @companies_house_check = DefraRubyCompaniesHouse.new(@transient_registration.company_no)
     end
 
     def create

app/forms/waste_carriers_engine/check_registered_company_name_form.rb

@@ -2,5 +2,20 @@
 
 module WasteCarriersEngine
   class CheckRegisteredCompanyNameForm < ::WasteCarriersEngine::BaseForm
+    delegate :company_no, to: :transient_registration
+
+    def company_name
+      companies_house_service.company_name
+    end
+
+    def registered_office_address_lines
+      companies_house_service.registered_office_address_lines
+    end
+
+    private
+
+    def companies_house_service
+      @_companies_house_service ||= DefraRubyCompaniesHouse.new(company_no)
+    end
   end
 end

app/presenters/waste_carriers_engine/can_present_entity_display_name.rb

@@ -11,9 +11,9 @@ module CanPresentEntityDisplayName
     # finding and formatting that single person.
     def entity_display_name
       if upper_tier_sole_trader?
-        list_main_people
+        legal_name_and_or_trading_name(list_main_people)
       else
-        company_registered_and_or_trading_name
+        legal_name_and_or_trading_name(registered_company_name)
       end
     end
 
@@ -30,15 +30,15 @@ def upper_tier_sole_trader?
       upper_tier? && business_type == "soleTrader"
     end
 
-    def company_registered_and_or_trading_name
+    def legal_name_and_or_trading_name(legal_name)
       if company_name.present?
-        if registered_company_name.present?
-          "#{registered_company_name} trading as #{company_name}"
+        if legal_name.present?
+          "#{legal_name} trading as #{company_name}"
         else
           company_name
         end
       else
-        registered_company_name
+        legal_name
       end
     end
   end

app/views/waste_carriers_engine/check_registered_company_name_forms/new.html.erb

@@ -12,12 +12,15 @@
     <%= form_for @check_registered_company_name_form do |f| %>
       <%= render partial: "waste_carriers_engine/shared/error_summary", locals: { f: f } %>
 
-      <h2 class="govuk-heading-m"> <%= @companies_house_check.company_name %> </h2>
-        <p class="govuk-body">
-          <% @companies_house_check.registered_office_address_lines.each do |line| %> 
-            <%= line %> <br>
-          <% end %>
-        </p>
+      <h2 class="govuk-heading-m">
+        <%= @check_registered_company_name_form.company_name %>
+      </h2>
+
+      <p class="govuk-body">
+        <% @check_registered_company_name_form.registered_office_address_lines.each do |line| %>
+          <%= line %> <br>
+        <% end %>
+      </p>
 
       <%= f.govuk_submit t(".next_button") %>
     <% end %>

spec/requests/waste_carriers_engine/check_registered_company_name_forms_spec.rb

@@ -24,7 +24,11 @@ module WasteCarriersEngine
           sign_in(user)
         end
 
+<<<<<<< HEAD
         context "when check_registered_companys_name_form is given a valid companys house number" do
+=======
+        context "when check_registered_company_name_form is given a valid companies house number" do
+>>>>>>> 8eed9a17d26f50a681030104e60bd48236ba64bc
           let(:transient_registration) do
             create(:new_registration,
                    :has_required_data,

spec/support/shared_examples/can_present_entity_display_name.rb

@@ -18,9 +18,22 @@
     context "when the registration business type is 'soleTrader'" do
       let(:business_type) { "soleTrader" }
       let(:key_people) { [person_a] }
+      let(:trader_name) { "#{key_people[0].first_name} #{key_people[0].last_name}" }
 
-      it "returns the carrier's name" do
-        expect(subject.entity_display_name).to eq("#{person_a.first_name} #{person_a.last_name}")
+      context "without a business name" do
+        let(:company_name) { nil }
+
+        it "returns the trader's name" do
+          expect(subject.entity_display_name).to eq trader_name
+        end
+      end
+
+      context "with a business name" do
+        let(:company_name) { Faker::Company.name }
+
+        it "returns the sole trader name and the business name" do
+          expect(subject.entity_display_name).to eq "#{trader_name} trading as #{company_name}"
+        end
       end
     end