Fix configurations controller to correctly display errors on update

solidusio · Sep 27, 2019 · de8cb94 · de8cb94
1 parent a384d55
commit de8cb94
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/controllers/backend/solidus_paypal_braintree/configurations_controller.rb b/lib/controllers/backend/solidus_paypal_braintree/configurations_controller.rb
@@ -12,7 +12,8 @@ def update
       authorize! :update, SolidusPaypalBraintree::Configuration
 
       params = configurations_params[:configuration_fields]
-      if SolidusPaypalBraintree::Configuration.update(params.keys, params.values)
+      results = SolidusPaypalBraintree::Configuration.update(params.keys, params.values)
+      if results.all? { |r| r.valid? }
         flash[:success] = t('update_success', scope: 'solidus_paypal_braintree.configurations')
       else
         flash[:error] = t('update_error', scope: 'solidus_paypal_braintree.configurations')

diff --git a/spec/controllers/solidus_paypal_braintree/configurations_controller_spec.rb b/spec/controllers/solidus_paypal_braintree/configurations_controller_spec.rb
@@ -25,12 +25,17 @@
   end
 
   describe "POST #update" do
+    let(:paypal_button_color) { 'blue' }
     let(:configurations_params) do
       {
         configurations: {
           configuration_fields: {
             store_1_config.id.to_s => { paypal: true, apple_pay: true },
-            store_2_config.id.to_s => { paypal: true, apple_pay: false }
+            store_2_config.id.to_s => {
+              paypal: true,
+              apple_pay: false,
+              preferred_paypal_button_color: paypal_button_color
+            }
           }
         }
       }
@@ -55,7 +60,7 @@
     end
 
     context "with invalid parameters" do
-      before { allow(SolidusPaypalBraintree::Configuration).to receive(:update) { false } }
+      let(:paypal_button_color) { 'invalid-color'}
 
       it "displays an error message to the user" do
         subject