Fix nested screenshot app config parsing

mconnell · mconnell · commit 4d6111db43a5 · 2026-03-31T16:44:50.000+01:00
diff --git a/lib/preflight_qa/screenshots.rb b/lib/preflight_qa/screenshots.rb
@@ -51,14 +51,24 @@ def append_optional_field(payload, key, options)
     private_class_method :append_optional_field
 
     def normalize_apps(apps)
-      raise ArgumentError, "apps must be a hash of app keys to mode arrays" unless apps.is_a?(Hash)
+      raise ArgumentError, "apps must be a hash of app keys to mode hashes" unless apps.is_a?(Hash)
 
-      apps.each_with_object({}) do |(app, modes), normalized|
-        normalized[app.to_s] = { modes: normalize_modes(modes) }
+      apps.each_with_object({}) do |(app, config), normalized|
+        normalized[app.to_s] = normalize_app_config(config)
       end
     end
     private_class_method :normalize_apps
 
+    def normalize_app_config(config)
+      raise ArgumentError, "each app config must be a hash with :modes" unless config.is_a?(Hash)
+
+      modes = config[:modes] || config["modes"]
+      raise ArgumentError, "each app config must include :modes" if modes.nil?
+
+      { modes: normalize_modes(modes) }
+    end
+    private_class_method :normalize_app_config
+
     def normalize_modes(modes)
       Array(modes).map(&:to_s)
     end
diff --git a/spec/preflight_qa/screenshots_spec.rb b/spec/preflight_qa/screenshots_spec.rb
@@ -52,7 +52,7 @@
     result = described_class.create(
       subject: "My Test Email",
       html: "<html>test</html>",
-      apps: { apple_mail_mac: [:light, :dark] },
+      apps: { apple_mail_mac: { modes: [:light, :dark] } },
       webhook_url: "https://example.test/webhook",
       locale: "en-GB"
     )
@@ -77,6 +77,16 @@
     end.to raise_error(ArgumentError, /apps must be a hash/)
   end
 
+  it "raises when an app config does not include modes" do
+    expect do
+      described_class.create(
+        subject: "My Test Email",
+        html: "<html>test</html>",
+        apps: { apple_mail_mac: {} }
+      )
+    end.to raise_error(ArgumentError, /must include :modes/)
+  end
+
   it "finds screenshots by uuid" do
     allow(client).to receive(:get)
       .with("/screenshots/1b153496-f702-4f89-85b4-cd1a9516cbbe")
