From d2b9f22a766a12c780d32d4b607e69349badbf1f Mon Sep 17 00:00:00 2001
From: Geoff Taylor <geoff@axistaylor.com>
Date: Mon, 20 May 2024 17:25:24 -0400
Subject: [PATCH] devops: More CI fixes

---
 tests/_data/.gitignore     |  2 +-
 tests/_data/.gitkeep       |  0
 tests/_data/e2e-config.php | 13 ++++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 tests/_data/.gitkeep

diff --git a/tests/_data/.gitignore b/tests/_data/.gitignore
index b503cd89d..48e029b16 100644
--- a/tests/_data/.gitignore
+++ b/tests/_data/.gitignore
@@ -1 +1 @@
-dump.sql
\ No newline at end of file
+*.sql
\ No newline at end of file
diff --git a/tests/_data/.gitkeep b/tests/_data/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/_data/e2e-config.php b/tests/_data/e2e-config.php
index 0812b2d3a..2df917070 100644
--- a/tests/_data/e2e-config.php
+++ b/tests/_data/e2e-config.php
@@ -1,7 +1,10 @@
 <?php
 
+// forcing has_block_template to be false
+add_filter( 'woocommerce_has_block_template', '__return_false', 10, 2 );
+
 //Additional cart fees.
-\add_action(
+add_action(
     'woocommerce_cart_calculate_fees',
     static function () {
         $percentage = 0.01;
@@ -11,7 +14,7 @@ static function () {
 );
 
 // Create Shipping Zones.
-$zone = new \WC_Shipping_Zone();
+$zone = new WC_Shipping_Zone();
 $zone->set_zone_name( 'Local' );
 $zone->set_zone_order( 1 );
 $zone->add_location( 'GB', 'country' );
@@ -20,7 +23,7 @@ static function () {
 $zone->add_shipping_method( 'flat_rate' );
 $zone->add_shipping_method( 'free_shipping' );
 
-$zone = new \WC_Shipping_Zone();
+$zone = new WC_Shipping_Zone();
 $zone->set_zone_name( 'Europe' );
 $zone->set_zone_order( 2 );
 $zone->add_location( 'EU', 'continent' );
@@ -28,7 +31,7 @@ static function () {
 $zone->add_shipping_method( 'flat_rate' );
 $zone->add_shipping_method( 'free_shipping' );
 
-$zone = new \WC_Shipping_Zone();
+$zone = new WC_Shipping_Zone();
 $zone->set_zone_name( 'California' );
 $zone->set_zone_order( 3 );
 $zone->add_location( 'US:CA', 'state' );
@@ -36,7 +39,7 @@ static function () {
 $zone->add_shipping_method( 'flat_rate' );
 $zone->add_shipping_method( 'free_shipping' );
 
-$zone = new \WC_Shipping_Zone();
+$zone = new WC_Shipping_Zone();
 $zone->set_zone_name( 'US' );
 $zone->set_zone_order( 4 );
 $zone->add_location( 'US', 'country' );