Improve tests

betagouv · Feb 18, 2025 · 1781e2b · 1781e2b
1 parent 797fc35
commit 1781e2b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/app/services/asp/mappers/adresse/indu_etranger_mapper.rb b/app/services/asp/mappers/adresse/indu_etranger_mapper.rb
@@ -5,15 +5,15 @@ module Mappers
     module Adresse
       class InduEtrangerMapper < FranceMapper
         def localiteetranger
-          student.address_line1
+          student.address_city
         end
 
         def bureaudistribetranger
-          student.address_line2
+          student.address_postal_code
         end
 
         def voiepointgeoetranger
-          student.address_line2
+          student.address_line1
         end
 
         def districtetranger

diff --git a/lib/asp/entities/adresse/indu_etranger.rb b/lib/asp/entities/adresse/indu_etranger.rb
@@ -30,13 +30,15 @@ def root_node_name
         end
 
         def fragment(xml) # rubocop:disable Metrics/AbcSize
+          xml.codetypeadr(codetypeadr)
+          xml.codeinseepays(codeinseepays)
+
           xml.localiteetranger(localiteetranger)
           xml.bureaudistribetranger(bureaudistribetranger)
+
           xml.voiepointgeoetranger(voiepointgeoetranger) if voiepointgeoetranger.present?
           xml.districtetranger(districtetranger) if districtetranger.present?
           xml.regionetranger(regionetranger) if regionetranger.present?
-          xml.codetypeadr(codetypeadr)
-          xml.codeinseepays(codeinseepays)
         end
       end
     end

diff --git a/spec/lib/asp/entities/adresse/indu_etranger_spec.rb b/spec/lib/asp/entities/adresse/indu_etranger_spec.rb
@@ -9,7 +9,9 @@
     before do
       pfmp.student.update(
         address_line1: "A" * 50,
-        address_line2: "B" * 50
+        address_line2: "B" * 50,
+        address_city: "Cool City",
+        address_postal_code: 66666
       )
     end
 
@@ -24,8 +26,8 @@
       let(:probe) { %w[codetypeadr PRINCIPALE] }
 
       it "uses the establishment details for the address" do # rubocop:disable RSpec/MultipleExpectations
-        expect(document.at("localiteetranger").text).to eq "A" * 38
-        expect(document.at("bureaudistribetranger").text).to eq  "B" * 38
+        expect(document.at("localiteetranger").text).to eq "Cool City"
+        expect(document.at("bureaudistribetranger").text).to eq  66666.to_s
       end
     end
   end