Merge branch 'main' into sorbet

Author: stefan-burke

Gemfile.lock

@@ -156,7 +156,7 @@ GEM
       dotenv (= 3.1.8)
       railties (>= 6.1)
     drb (2.2.3)
-    en14960 (0.4.0)
+    en14960 (0.4.2)
       sorbet-runtime (~> 0.5)
     erb (5.0.2)
     erb_lint (0.9.0)

app/controllers/safety_standards_controller.rb

@@ -250,23 +250,7 @@ def build_runout_result(platform_height, has_stop_wall)
 
   sig { params(platform_height: Float, user_height: Float).returns(T.untyped) }
   def build_wall_height_result(platform_height, user_height)
-    # Workaround for EN14960 v0.4.0 bug where it returns Integer 0 instead of Float 0.0
-    # when platform_height < 0.6
-
-    EN14960.calculate_wall_height(
-      platform_height, user_height
-    )
-  rescue TypeError => e
-    if e.message.include?("got type Integer with value 0")
-      # Return the expected response for no walls required
-      EN14960::CalculatorResponse.new(
-        value: 0.0,
-        value_suffix: "m",
-        breakdown: [["No walls required", "Platform height < 0.6m"]]
-      )
-    else
-      raise e
-    end
+    EN14960.calculate_wall_height(platform_height, user_height)
   end
 
   sig { returns(T::Hash[Symbol, T.untyped]) }

spec/support/safety_standards_test_helpers.rb

@@ -221,8 +221,7 @@ def expect_wall_height_breakdown_content(
   )
     if no_walls
       expect(page).to have_content("Required Wall Height: 0.0m")
-      expect(page).to have_content("No walls required")
-      expect(page).to have_content("Platform height < 0.6m")
+      expect(page).to have_content("No containing walls required")
     else
       expect(page).to have_content("Required Wall Height: #{height}m")
       expect(page).to have_content(range)