From 717a34aa99ce8890cfaeb4f8bbf25eaa5423786a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 28 Jul 2022 11:24:50 +1000
Subject: [PATCH] Fixes for tests

---
 app/Http/Controllers/TwilioController.php       | 2 +-
 tests/Feature/ApplePayDomainMerchantUrlTest.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/TwilioController.php b/app/Http/Controllers/TwilioController.php
index 16fa06484f15..fd9a417627e1 100644
--- a/app/Http/Controllers/TwilioController.php
+++ b/app/Http/Controllers/TwilioController.php
@@ -53,7 +53,7 @@ class TwilioController extends BaseController
         }
         catch(\Exception $e) {
 
-            return response()->json(['message' => 'Phone number format is incorrect, please use international number format and try again.'], 400);
+            return response()->json(['message' => 'Invalid phone number please use + country code + number ie. +15552343334'], 400);
 
         }
 
diff --git a/tests/Feature/ApplePayDomainMerchantUrlTest.php b/tests/Feature/ApplePayDomainMerchantUrlTest.php
index c2c27e1e92a0..9fed7cf1886f 100644
--- a/tests/Feature/ApplePayDomainMerchantUrlTest.php
+++ b/tests/Feature/ApplePayDomainMerchantUrlTest.php
@@ -39,9 +39,9 @@ class ApplePayDomainMerchantUrlTest extends TestCase
 
     public function testMerchantFieldGet()
     {
-        // if (! config('ninja.testvars.stripe')) {
+        if (! config('ninja.testvars.stripe')) {
             $this->markTestSkipped('Skip test no company gateways installed');
-        // }
+        }
 
         $config = new \stdClass;
         $config->publishableKey = 'pk_test';
@@ -56,7 +56,7 @@ class ApplePayDomainMerchantUrlTest extends TestCase
         $cg->require_billing_address = true;
         $cg->require_shipping_address = true;
         $cg->update_details = true;
-        $cg->setConfig(json_encode($config));
+        $cg->setConfig($config);
         $cg->fees_and_limits = '';
         $cg->save();