Fix weight units bug in views (#1074)

rubyforgood · Oct 21, 2024 · 2884d06 · 2884d06
1 parent 4e046e5
commit 2884d06
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/app/views/organizations/adoptable_pets/index.html.erb b/app/views/organizations/adoptable_pets/index.html.erb
@@ -86,7 +86,7 @@
                 <%= tag.li("Age: #{time_ago_in_words(pet.birth_date).titleize}", class: li_classes) %>
                 <%= tag.li("Breed: #{pet.breed}", class: li_classes) %>
                 <%= tag.li("Sex: #{pet.sex}", class: li_classes) %>
-                <%= tag.li("Weight range: #{[pet.weight_from, pet.weight_to].join("-")} kg", class: li_classes) %>
+                <%= tag.li("Weight range: #{[pet.weight_from, pet.weight_to].join("-")} #{pet.weight_unit}", class: li_classes) %>
               </ul>
             <% end %>
           <% end %>

diff --git a/app/views/organizations/adopter_fosterer/likes/index.html.erb b/app/views/organizations/adopter_fosterer/likes/index.html.erb
@@ -32,7 +32,7 @@
                     <%= tag.li("#{t('general.age')}: #{time_ago_in_words(pet.birth_date).titleize}", class: li_classes) %>
                     <%= tag.li("#{t('general.breed')}: #{pet.breed}", class: li_classes) %>
                     <%= tag.li("#{t('general.sex')}: #{pet.sex}", class: li_classes) %>
-                    <%= tag.li("#{t('general.weight_range')}: #{[pet.weight_from, pet.weight_to].join("-")} kg", class: li_classes) %>
+                    <%= tag.li("#{t('general.weight_range')}: #{[pet.weight_from, pet.weight_to].join("-")} #{pet.weight_unit}", class: li_classes) %>
                   </ul>
                 <% end %>
               <% end %>

diff --git a/test/controllers/organizations/adoptable_pets_controller_test.rb b/test/controllers/organizations/adoptable_pets_controller_test.rb
@@ -26,6 +26,16 @@ class Organizations::AdoptablePetsControllerTest < ActionDispatch::IntegrationTe
       assert_equal 1, assigns[:pets].count
       assert assigns[:pets].pluck(:id).exclude?(adopted_pet.id)
     end
+
+    should "render information on pets" do
+      get adoptable_pets_url
+
+      assert_select(".card li:nth-of-type(1)", text: /#{@pet.name}\s+#{@pet.species}/)
+      assert_select(".card li:nth-of-type(2)", text: /Age/)
+      assert_select(".card li:nth-of-type(3)", text: "Breed: #{@pet.breed}")
+      assert_select(".card li:nth-of-type(4)", text: "Sex: #{@pet.sex}")
+      assert_select(".card li:nth-of-type(5)", text: "Weight range: #{@pet.weight_from}-#{@pet.weight_to} #{@pet.weight_unit}")
+    end
   end
 
   context "#show" do