Consolidate fail / error states

Author: lewispb

app/assets/stylesheets/upright/application.css

@@ -594,8 +594,7 @@
     font-weight: 500;
   }
 
-  .status-fail,
-  .status-error {
+  .status-fail {
     color: var(--color-negative);
     font-weight: 600;
   }

app/models/concerns/upright/probeable.rb

@@ -76,10 +76,10 @@ def failsafe_check
     end
 
     def result_description(result, error = nil)
-      if error
-        :error
+      if error || !result
+        :fail
       else
-        result ? :ok : :fail
+        :ok
       end
     end
 

app/models/upright/probe_result.rb

@@ -8,7 +8,7 @@ class Upright::ProbeResult < Upright::ApplicationRecord
   scope :by_name, ->(name) { where(probe_name: name) if name.present? }
   scope :stale, -> { where(created_at: ...24.hours.ago) }
 
-  enum :status, [ :ok, :fail, :error ]
+  enum :status, [ :ok, :fail ]
 
   has_many_attached :artifacts
 

test/controllers/probe_results_controller_test.rb

@@ -14,7 +14,7 @@ class ProbeResultsControllerTest < ActionDispatch::IntegrationTest
   test "filters by probe type when signed in" do
     get upright.site_root_path(probe_type: "playwright")
     assert_response :success
-    assert_select "p", text: /for playwright probes/
+    assert_select "p", text: /for Playwright probes/
     assert_select "td", text: /#{upright_probe_results(:playwright_probe_result).probe_name}/
     assert_select "td", text: /#{upright_probe_results(:http_probe_result).probe_name}/, count: 0
   end
@@ -60,7 +60,7 @@ class ProbeResultsControllerTest < ActionDispatch::IntegrationTest
     chart_data = JSON.parse(css_select("[data-probe-results-chart-results-value]").first["data-probe-results-chart-results-value"])
 
     assert chart_data.all? { |r| r["status"] == "fail" }
-    assert_equal 1, chart_data.length
+    assert_equal 2, chart_data.length
   end
 
   test "paginates results when there are many" do

test/fixtures/upright_probe_results.yml

@@ -46,6 +46,6 @@ http_probe_result_error:
   probe_name: HTTP Probe
   probe_target: https://example.com
   duration: 1.0
-  status: "error"
+  status: "fail"
   created_at: <%= Time.current %>
   updated_at: <%= Time.current %>

test/models/upright/probe_result_test.rb

@@ -25,7 +25,7 @@ class Upright::ProbeResultTest < ActiveSupport::TestCase
 
     result = Upright::ProbeResult.create!(
       probe_name: "test", probe_type: "http", probe_target: "https://example.com",
-      status: :error, duration: 1.0, error: exception
+      status: :fail, duration: 1.0, error: exception
     )
 
     expected = <<~REPORT.chomp

test/models/upright/probes/http_probe_test.rb

@@ -124,7 +124,7 @@ class Upright::Probes::HTTPProbeTest < ActiveSupport::TestCase
     assert_equal "https://example.com/", result.probe_target
   end
 
-  test "check_and_record creates error result with exception artifact when check raises" do
+  test "check_and_record creates fail result with exception artifact when check raises" do
     stub_request(:get, "https://example.com/").to_return(status: 200)
     set_test_site
     probe = Upright::Probes::HTTPProbe.new(name: "test", url: "https://example.com/")
@@ -135,7 +135,7 @@ class Upright::Probes::HTTPProbeTest < ActiveSupport::TestCase
     probe.check_and_record
 
     result = Upright::ProbeResult.last
-    assert_equal "error", result.status
+    assert_equal "fail", result.status
     assert_match(/RuntimeError: connection refused/, result.exception_report)
   end
 

test/models/upright/probes/playwright_probe_test.rb

@@ -87,7 +87,7 @@ def check
       probe.check_and_record
 
       probe_result = Upright::ProbeResult.last
-      assert_equal "error", probe_result.status
+      assert_equal "fail", probe_result.status
       assert_equal "playwright", probe_result.probe_type
       assert_equal "failing_probe", probe_result.probe_name
       assert probe_result.artifacts.attached?, "Expected artifacts to be attached"