From 88c833ec831e95df61783962b314b1a0b8ebde2a Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Bellet <jb.bellet@gmail.com>
Date: Mon, 27 Mar 2023 15:57:46 +0200
Subject: [PATCH 1/2] Sort array to avoid flaky spec when comparing values

---
 spec/services/order_cycle_form_spec.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spec/services/order_cycle_form_spec.rb b/spec/services/order_cycle_form_spec.rb
index 562a0b2ed6..865bf7d92c 100644
--- a/spec/services/order_cycle_form_spec.rb
+++ b/spec/services/order_cycle_form_spec.rb
@@ -410,10 +410,9 @@ describe OrderCycleForm do
               )
 
               expect{ form.save }.to change{
-                order_cycle.distributor_shipping_methods.pluck(:id)
-              }.from([
-                       distributor_shipping_method, distributor_shipping_method2
-                     ]).to([distributor_shipping_method])
+                order_cycle.distributor_shipping_methods.pluck(:id).sort
+              }.from([distributor_shipping_method, distributor_shipping_method2].sort)
+                .to([distributor_shipping_method])
             end
           end
           context "can't update other distributors' shipping methods" do

From 0a91f3d392a355c4a00d213cac0d78cccbb7ded0 Mon Sep 17 00:00:00 2001
From: filipefurtad0 <filipefurtado@gmail.com>
Date: Tue, 28 Mar 2023 14:34:03 +0100
Subject: [PATCH 2/2] Sorts all shipiping method arrays

---
 spec/services/order_cycle_form_spec.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/spec/services/order_cycle_form_spec.rb b/spec/services/order_cycle_form_spec.rb
index 865bf7d92c..ac38eb118e 100644
--- a/spec/services/order_cycle_form_spec.rb
+++ b/spec/services/order_cycle_form_spec.rb
@@ -362,8 +362,10 @@ describe OrderCycleForm do
               order_cycle.coordinator.users.first
             )
 
-            expect{ form.save }.to change{ order_cycle.distributor_shipping_methods.pluck(:id) }
-              .from([distributor_shipping_method, distributor_shipping_method2])
+            expect{ form.save }.to change{
+                                     order_cycle.distributor_shipping_methods.pluck(:id).sort
+                                   }
+              .from([distributor_shipping_method, distributor_shipping_method2].sort)
               .to([distributor_shipping_method])
           end
         end
@@ -379,8 +381,8 @@ describe OrderCycleForm do
             )
 
             expect{ form.save }.not_to change{
-              order_cycle.distributor_shipping_methods.pluck(:id)
-            }.from([distributor_shipping_method, distributor_shipping_method2])
+              order_cycle.distributor_shipping_methods.pluck(:id).sort
+            }.from([distributor_shipping_method, distributor_shipping_method2].sort)
           end
         end
         context "submitter is an admin" do
@@ -393,8 +395,10 @@ describe OrderCycleForm do
               create(:admin_user)
             )
 
-            expect{ form.save }.to change{ order_cycle.distributor_shipping_methods.pluck(:id) }
-              .from([distributor_shipping_method, distributor_shipping_method2])
+            expect{ form.save }.to change{
+                                     order_cycle.distributor_shipping_methods.pluck(:id).sort
+                                   }
+              .from([distributor_shipping_method, distributor_shipping_method2].sort)
               .to([distributor_shipping_method])
           end
         end
@@ -432,11 +436,11 @@ describe OrderCycleForm do
               )
 
               expect{ form.save }.not_to change{
-                order_cycle.distributor_shipping_methods.pluck(:id)
+                order_cycle.distributor_shipping_methods.pluck(:id).sort
               }.from [
                 distributor_shipping_method, distributor_shipping_method2,
                 distributor_shipping_method3
-              ]
+              ].sort
             end
           end
         end