From ee7dc821ca090967622891235003907cebeff479 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Mon, 29 Aug 2022 14:39:43 +1000
Subject: [PATCH 1/3] Correct typo in spec which lead to flakiness

I'm not sure why this spec passed on CI when it was retried but it was
obviously wrong. Correcting that copy&paste error seems to make the spec
pass.
---
 spec/controllers/split_checkout_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/split_checkout_controller_spec.rb b/spec/controllers/split_checkout_controller_spec.rb
index f05ec76563..21beeb7d24 100644
--- a/spec/controllers/split_checkout_controller_spec.rb
+++ b/spec/controllers/split_checkout_controller_spec.rb
@@ -129,7 +129,7 @@ describe SplitCheckoutController, type: :controller do
 
           it "don't updates default ship address on user" do
             expect {
-              put :update, params: params.merge({ order: { save_bill_address: "0" } })
+              put :update, params: params.merge({ order: { save_ship_address: "0" } })
             }.to_not change {
               order.user.reload.ship_address
             }

From 3a365b6dc69cb5b273a1384c03a0c8a40b24c0f3 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Mon, 29 Aug 2022 14:42:11 +1000
Subject: [PATCH 2/3] Remove useless braces

---
 spec/controllers/split_checkout_controller_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/controllers/split_checkout_controller_spec.rb b/spec/controllers/split_checkout_controller_spec.rb
index 21beeb7d24..c5a2fd68c0 100644
--- a/spec/controllers/split_checkout_controller_spec.rb
+++ b/spec/controllers/split_checkout_controller_spec.rb
@@ -114,14 +114,14 @@ describe SplitCheckoutController, type: :controller do
         describe "saving default addresses" do
           it "don't updates default bill address on user" do
             expect {
-              put :update, params: params.merge({ order: { save_bill_address: "0" } })
+              put :update, params: params.merge(order: { save_bill_address: "0" })
             }.to_not change {
               order.user.reload.bill_address
             }
           end
 
           it "updates default bill address on user and customer" do
-            put :update, params: params.merge({ order: { save_bill_address: "1" } })
+            put :update, params: params.merge(order: { save_bill_address: "1" })
 
             expect(order.customer.bill_address).to eq(order.bill_address)
             expect(order.user.bill_address).to eq(order.bill_address)
@@ -129,14 +129,14 @@ describe SplitCheckoutController, type: :controller do
 
           it "don't updates default ship address on user" do
             expect {
-              put :update, params: params.merge({ order: { save_ship_address: "0" } })
+              put :update, params: params.merge(order: { save_ship_address: "0" })
             }.to_not change {
               order.user.reload.ship_address
             }
           end
 
           it "updates default ship address on user and customer" do
-            put :update, params: params.merge({ order: { save_ship_address: "1" } })
+            put :update, params: params.merge(order: { save_ship_address: "1" })
 
             expect(order.customer.ship_address).to eq(order.ship_address)
             expect(order.user.ship_address).to eq(order.ship_address)

From bf3da0531e4ac9bbebb394da32b430df56508c74 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Mon, 29 Aug 2022 14:43:43 +1000
Subject: [PATCH 3/3] Correct grammar in spec description

---
 spec/controllers/split_checkout_controller_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/split_checkout_controller_spec.rb b/spec/controllers/split_checkout_controller_spec.rb
index c5a2fd68c0..13120a8d09 100644
--- a/spec/controllers/split_checkout_controller_spec.rb
+++ b/spec/controllers/split_checkout_controller_spec.rb
@@ -112,7 +112,7 @@ describe SplitCheckoutController, type: :controller do
         end
 
         describe "saving default addresses" do
-          it "don't updates default bill address on user" do
+          it "doesn't update default bill address on user" do
             expect {
               put :update, params: params.merge(order: { save_bill_address: "0" })
             }.to_not change {
@@ -127,7 +127,7 @@ describe SplitCheckoutController, type: :controller do
             expect(order.user.bill_address).to eq(order.bill_address)
           end
 
-          it "don't updates default ship address on user" do
+          it "doesn't update default ship address on user" do
             expect {
               put :update, params: params.merge(order: { save_ship_address: "0" })
             }.to_not change {