Fix Merchants controller (#704)

* Add climate_control gem and test helper

* Replace ENV mods in upgrades test

* Replace ENV mods in registrations test

* Remove ENV references in hostings controller

* Update ENV refs in mailer test

* ActiveStorage cleanup

* Consolidate queue config so appropriate adapter runs in test environment

* Make test environment more explicit

* Centralize self hosting config

* Remove flaky system test

* Fix merchants controller actions

app/controllers/transactions/merchants_controller.rb

@@ -10,22 +10,16 @@ class Transactions::MerchantsController < ApplicationController
   end
 
   def create
-    if Current.family.transaction_merchants.create(merchant_params)
+    Current.family.transaction_merchants.create!(merchant_params)
     redirect_to transaction_merchants_path, notice: t(".success")
-    else
-      render transaction_merchants_path, status: :unprocessable_entity, notice: t(".error")
-    end
   end
 
   def edit
   end
 
   def update
-    if @merchant.update(merchant_params)
+    @merchant.update!(merchant_params)
     redirect_to transaction_merchants_path, notice: t(".success")
-    else
-      render transaction_merchants_path, status: :unprocessable_entity, notice: t(".error")
-    end
   end
 
   def destroy

config/locales/views/transaction/en.yml

@@ -59,7 +59,6 @@ en:
       edit_categories: Edit categories
     merchants:
       create:
-        error: Error creating merchant
         success: New merchant created successfully
       destroy:
         success: Merchant deleted successfully
@@ -84,7 +83,6 @@ en:
       new:
         title: New merchant
       update:
-        error: Error updating merchant
         success: Merchant updated successfully
     update:
       success: Transaction updated successfully