Merge pull request #3996 from nebulab/spaghetticode/fix-flash-message

[ADMIN] Properly format flash error message
solidusio · May 20, 2021 · b6e24da · b6e24da
2 parents 6d5440f + f3b5d76
commit b6e24da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/backend/app/controllers/spree/admin/orders_controller.rb b/backend/app/controllers/spree/admin/orders_controller.rb
@@ -86,7 +86,7 @@ def advance
           if @order.can_complete?
             flash[:success] = t('spree.order_ready_for_confirm')
           else
-            flash[:error] = @order.errors.full_messages
+            flash[:error] = @order.errors.full_messages.join(', ')
           end
           redirect_to confirm_admin_order_url(@order)
         end

diff --git a/backend/spec/controllers/spree/admin/orders_controller_spec.rb b/backend/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -183,12 +183,12 @@
         context 'when unsuccessful' do
           before do
             allow(order).to receive(:can_complete?).and_return(false)
-            allow(order).to receive(:errors).and_return(double(full_messages: ['failed']))
+            allow(order).to receive(:errors).and_return(double(full_messages: ['invalid address', 'invalid email']))
           end
 
           it 'messages and redirects' do
             subject
-            expect(flash[:error]).to eq order.errors.full_messages
+            expect(flash[:error]).to eq 'invalid address, invalid email'
             expect(response).to redirect_to(spree.confirm_admin_order_path(order))
           end
         end