diff --git a/tests/unit-tests/api/product-variations.php b/tests/unit-tests/api/product-variations.php index ae45f94930e..6802e87b9ce 100644 --- a/tests/unit-tests/api/product-variations.php +++ b/tests/unit-tests/api/product-variations.php @@ -499,10 +499,6 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case { foreach ( $response_variations as $response_variation ) { $this->assertContains( $response_variation['id'], $variations ); } - - // Clean up. - wp_delete_term( $category['term_id'], 'product_cat' ); - $variable_product->delete( true ); } /** @@ -565,11 +561,6 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case { $this->assertEquals( 200, $response->get_status() ); $this->assertCount( 0, $response_variations ); - - $simple->delete( true ); - $external->delete( true ); - $variable->delete( true ); - $grouped->delete( true ); } /** @@ -618,9 +609,6 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case { foreach ( $response_variations as $response_variation ) { $this->assertContains( $response_variation['id'], $nonfeat_variations ); } - - $feat_product->delete( true ); - $nonfeat_product->delete( true ); } /** @@ -676,10 +664,6 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case { foreach ( $response_variations as $response_variation ) { $this->assertEquals( $response_variation['id'], $variations[1]['variation_id'] ); } - - $variable->delete( true ); - wp_delete_term( $shipping_class_1['term_id'], 'product_shipping_class' ); - wp_delete_term( $shipping_class_2['term_id'], 'product_shipping_class' ); } /** @@ -725,10 +709,6 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case { $this->assertEquals( 200, $response->get_status() ); $this->assertEquals( 0, count( $response_variations ) ); - - $variable_product->delete( true ); - $variable_product_2->delete( true ); - wp_delete_term( $test_tag_1['term_id'], 'product_tag' ); } /** @@ -737,7 +717,6 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case { * @since 3.5.0 */ public function test_get_product_by_attribute() { - global $wpdb; wp_set_current_user( $this->user ); // Variable product with 2 different variations. @@ -776,7 +755,5 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case { $this->assertContains( $response_variation['id'], $expected_product_ids ); } } - - $variable_product->delete( true ); } } diff --git a/tests/unit-tests/api/products.php b/tests/unit-tests/api/products.php index e960bfec245..5cac9504701 100644 --- a/tests/unit-tests/api/products.php +++ b/tests/unit-tests/api/products.php @@ -570,11 +570,6 @@ class Products_API extends WC_REST_Unit_Test_Case { $this->assertCount( 1, $response_product['categories'] ); $this->assertEquals( 'uncategorized', $response_product['categories'][0]['slug'] ); - // Clean up. - wp_delete_term( $category['term_id'], 'product_cat' ); - $product->delete( true ); - $product_2->delete( true ); - } /** @@ -616,11 +611,6 @@ class Products_API extends WC_REST_Unit_Test_Case { $this->assertContains( $response_product['id'], $product_ids_for_type[ $product_type ], 'REST API: ' . $product_type . ' not found correctly' ); } } - - $simple->delete( true ); - $external->delete( true ); - $variable->delete( true ); - $grouped->delete( true ); } /** @@ -665,9 +655,6 @@ class Products_API extends WC_REST_Unit_Test_Case { foreach ( $response_products as $response_product ) { $this->assertEquals( $nonfeat_product->get_id(), $response_product['id'], 'REST API: Featured product not found correctly' ); } - - $feat_product->delete( true ); - $nonfeat_product->delete( true ); } /** @@ -696,9 +683,6 @@ class Products_API extends WC_REST_Unit_Test_Case { foreach ( $response_products as $response_product ) { $this->assertEquals( $product_1->get_id(), $response_product['id'] ); } - - $product_1->delete( true ); - wp_delete_term( $shipping_class_1['term_id'], 'product_shipping_class' ); } /** @@ -731,10 +715,6 @@ class Products_API extends WC_REST_Unit_Test_Case { foreach ( $response_products as $response_product ) { $this->assertEquals( $product->get_id(), $response_product['id'] ); } - - $product->delete( true ); - $product_2->delete( true ); - wp_delete_term( $test_tag_1['term_id'], 'product_tag' ); } /** @@ -806,9 +786,5 @@ class Products_API extends WC_REST_Unit_Test_Case { foreach ( $response_products as $response_product ) { $this->assertContains( $response_product['id'], $expected_product_ids ); } - - $variable_product->delete( true ); - $product_1->delete( true ); - $product_2->delete( true ); } } diff --git a/tests/unit-tests/cart/functions.php b/tests/unit-tests/cart/functions.php index 33f68fa8c6d..7f0953115e8 100644 --- a/tests/unit-tests/cart/functions.php +++ b/tests/unit-tests/cart/functions.php @@ -47,17 +47,10 @@ class WC_Tests_Cart_Functions extends WC_Unit_Test_Case { // Make sure pages exist WC_Install::create_pages(); - // Get the original setting - $o_setting = get_option( 'woocommerce_force_ssl_checkout' ); - // Force SSL checkout update_option( 'woocommerce_force_ssl_checkout', 'no' ); $this->assertEquals( $this->get_checkout_url(), wc_get_checkout_url() ); - - // Restore option - update_option( 'woocommerce_force_ssl_checkout', $o_setting ); - } /** @@ -69,17 +62,10 @@ class WC_Tests_Cart_Functions extends WC_Unit_Test_Case { // Make sure pages exist WC_Install::create_pages(); - // Get the original setting - $o_setting = get_option( 'woocommerce_force_ssl_checkout' ); - // Force SSL checkout update_option( 'woocommerce_force_ssl_checkout', 'yes' ); $this->assertEquals( $this->get_checkout_url(), wc_get_checkout_url() ); - - // Restore option - update_option( 'woocommerce_force_ssl_checkout', $o_setting ); - } /** @@ -99,9 +85,6 @@ class WC_Tests_Cart_Functions extends WC_Unit_Test_Case { // Check if the cart is empty $this->assertEquals( 0, WC()->cart->get_cart_contents_count() ); - - // Delete the previously created product - WC_Helper_Product::delete_product( $product->get_id() ); } /** @@ -126,8 +109,6 @@ class WC_Tests_Cart_Functions extends WC_Unit_Test_Case { WC()->cart->add_to_cart( $product->get_id(), 1 ); $this->expectOutputString( wc_price( $product->get_price( 'edit' ) ), wc_cart_totals_subtotal_html() ); - - WC_Helper_Product::delete_product( $product->get_id() ); } /** @@ -139,8 +120,6 @@ class WC_Tests_Cart_Functions extends WC_Unit_Test_Case { $coupon = WC_Helper_Coupon::create_coupon(); $this->expectOutputString( apply_filters( 'woocommerce_cart_totals_coupon_label', 'Coupon: ' . $coupon->get_code() ), wc_cart_totals_coupon_label( $coupon ) ); - - WC_Helper_Coupon::delete_coupon( $coupon->get_id() ); } /** diff --git a/tests/unit-tests/coupon/coupon.php b/tests/unit-tests/coupon/coupon.php index 12e671294df..05c4c954479 100644 --- a/tests/unit-tests/coupon/coupon.php +++ b/tests/unit-tests/coupon/coupon.php @@ -7,6 +7,13 @@ */ class WC_Tests_Coupon extends WC_Unit_Test_Case { + public function tearDown() { + WC()->cart->empty_cart(); + WC()->cart->remove_coupons(); + + parent::tearDown(); + } + /** * Test the code/id differentiation of the coupon constructor. * @@ -66,15 +73,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Test if total amount of coupons is 1 $this->assertEquals( 1, count( WC()->cart->get_applied_coupons() ) ); - - // Clean up the cart - WC()->cart->empty_cart(); - - // Remove coupons - WC()->cart->remove_coupons(); - - // Delete coupon - WC_Helper_Coupon::delete_coupon( $coupon->get_id() ); } /** @@ -95,18 +93,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Test if total amount of coupons is 1 $this->assertEquals( 1, count( WC()->cart->get_applied_coupons() ) ); - - // Clearing WC notices - wc_clear_notices(); - - // Clean up the cart - WC()->cart->empty_cart(); - - // Remove coupons - WC()->cart->remove_coupons(); - - // Delete coupon - WC_Helper_Coupon::delete_coupon( $coupon->get_id() ); } /** @@ -129,11 +115,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Create a flat rate method WC_Helper_Shipping::create_simple_flat_rate(); - // We need this to have the calculate_totals() method calculate totals - if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) { - define( 'WOOCOMMERCE_CHECKOUT', true ); - } - // Add product to cart WC()->cart->add_to_cart( $product->get_id(), 1 ); @@ -146,25 +127,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Test if the cart total amount is equal 15 $this->assertEquals( 15, WC()->cart->total ); - - // Clearing WC notices - wc_clear_notices(); - - // Clean up the cart - WC()->cart->empty_cart(); - - // Remove coupons - WC()->cart->remove_coupons(); - - // Delete the flat rate method - WC()->session->set( 'chosen_shipping_methods', array() ); - WC_Helper_Shipping::delete_simple_flat_rate(); - - // Delete coupon - WC_Helper_Coupon::delete_coupon( $coupon->get_id() ); - - // Delete product - WC_Helper_Product::delete_product( $product->get_id() ); } /** @@ -187,11 +149,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Create a flat rate method - $10 WC_Helper_Shipping::create_simple_flat_rate(); - // We need this to have the calculate_totals() method calculate totals - if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) { - define( 'WOOCOMMERCE_CHECKOUT', true ); - } - // Add fee - $10 WC_Helper_Fee::add_cart_fee(); @@ -207,28 +164,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Test if the cart total amount is equal 25 $this->assertEquals( 25, WC()->cart->total ); - - // Clearing WC notices - wc_clear_notices(); - - // Clean up the cart - WC()->cart->empty_cart(); - - // Remove coupons - WC()->cart->remove_coupons(); - - // Remove fee - WC_Helper_Fee::remove_cart_fee(); - - // Delete the flat rate method - WC()->session->set( 'chosen_shipping_methods', array() ); - WC_Helper_Shipping::delete_simple_flat_rate(); - - // Delete coupon - WC_Helper_Coupon::delete_coupon( $coupon->get_id() ); - - // Delete product - WC_Helper_Product::delete_product( $product->get_id() ); } /** @@ -251,11 +186,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Create a flat rate method WC_Helper_Shipping::create_simple_flat_rate(); - // We need this to have the calculate_totals() method calculate totals - if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) { - define( 'WOOCOMMERCE_CHECKOUT', true ); - } - // Add fee WC_Helper_Fee::add_cart_fee(); @@ -271,28 +201,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Test if the cart total amount is equal 29.5 $this->assertEquals( 29.5, WC()->cart->total ); - - // Clearing WC notices - wc_clear_notices(); - - // Clean up the cart - WC()->cart->empty_cart(); - - // Remove coupons - WC()->cart->remove_coupons(); - - // Remove fee - WC_Helper_Fee::remove_cart_fee(); - - // Delete the flat rate method - WC()->session->set( 'chosen_shipping_methods', array() ); - WC_Helper_Shipping::delete_simple_flat_rate(); - - // Delete coupon - WC_Helper_Coupon::delete_coupon( $coupon->get_id() ); - - // Delete product - WC_Helper_Product::delete_product( $product->get_id() ); } /** @@ -345,13 +253,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Test if the cart total amount is equal 19.5 (coupon only applying to one item). $this->assertEquals( 19.5, WC()->cart->total ); - - // Clean up - wc_clear_notices(); - WC()->cart->empty_cart(); - WC()->cart->remove_coupons(); - WC_Helper_Coupon::delete_coupon( $coupon->get_id() ); - WC_Helper_Product::delete_product( $product->get_id() ); } public function test_custom_discount_item_limit() { @@ -370,11 +271,6 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { 'limit_usage_to_x_items' => 1, ) ); - // We need this to have the calculate_totals() method calculate totals. - if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) { - define( 'WOOCOMMERCE_CHECKOUT', true ); - } - // Add 4 products and coupon to cart. WC()->cart->add_to_cart( $product->get_id(), 4 ); WC()->cart->add_discount( $coupon->get_code() ); @@ -382,13 +278,5 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case { // Test if the cart total amount is equal 39.5 (coupon only applying to one item). $this->assertEquals( 39.5, WC()->cart->total ); - - // Clean up - wc_clear_notices(); - WC()->cart->empty_cart(); - WC()->cart->remove_coupons(); - WC_Helper_Coupon::delete_coupon( $coupon->get_id() ); - WC_Helper_Product::delete_product( $product->get_id() ); - WC_Helper_Coupon::unregister_custom_type( __FUNCTION__ ); } } diff --git a/tests/unit-tests/customer/customer.php b/tests/unit-tests/customer/customer.php index b06569b71e6..05b093e102d 100644 --- a/tests/unit-tests/customer/customer.php +++ b/tests/unit-tests/customer/customer.php @@ -51,9 +51,6 @@ class WC_Tests_Customer extends WC_Unit_Test_Case { // Clean up the cart WC()->cart->empty_cart(); - - // Clean up product - WC_Helper_Product::delete_product( $product->get_id() ); } /** @@ -100,8 +97,5 @@ class WC_Tests_Customer extends WC_Unit_Test_Case { // Clean up the cart WC()->cart->empty_cart(); - - // Clean up product - WC_Helper_Product::delete_product( $product->get_id() ); } } diff --git a/tests/unit-tests/discounts/discounts.php b/tests/unit-tests/discounts/discounts.php index c19fdbada7a..a9e318a9474 100644 --- a/tests/unit-tests/discounts/discounts.php +++ b/tests/unit-tests/discounts/discounts.php @@ -72,31 +72,6 @@ class WC_Tests_Discounts extends WC_Unit_Test_Case { WC()->cart->empty_cart(); WC()->cart->remove_coupons(); - foreach ( $this->products as $product ) { - $product->delete( true ); - } - - foreach ( $this->coupons as $code => $coupon ) { - $coupon->delete( true ); - - // Temporarily necessary until https://github.com/woocommerce/woocommerce/pull/16767 is implemented. - wp_cache_delete( WC_Cache_Helper::get_cache_prefix( 'coupons' ) . 'coupon_id_from_code_' . $code, 'coupons' ); - } - - foreach ( $this->orders as $order ) { - $order->delete( true ); - } - - if ( $this->last_test_data ) { - if ( isset( $this->last_test_data['wc_options'] ) ) { - foreach ( $this->last_test_data['wc_options'] as $_option_name => $_option_value ) { - update_option( $_option_name, $_option_value['revert'] ); - } - } - - $this->last_test_data = null; - } - parent::tearDown(); } @@ -137,7 +112,6 @@ class WC_Tests_Discounts extends WC_Unit_Test_Case { $discounts = new WC_Discounts(); $discounts->set_items_from_cart( false ); $this->assertEquals( array(), $discounts->get_items() ); - $product->delete( true ); } /** @@ -174,7 +148,6 @@ class WC_Tests_Discounts extends WC_Unit_Test_Case { $discounts->set_items_from_cart( WC()->cart ); $discounts->apply_coupon( $coupon ); $this->assertEquals( 0, $discounts->get_discounted_price( current( $discounts->get_items() ) ), print_r( $discounts->get_discounts(), true ) ); - $product->delete( true ); } /** @@ -225,10 +198,6 @@ class WC_Tests_Discounts extends WC_Unit_Test_Case { } $this->assertEquals( $test_data['expected_total_discount'], $discount_total, 'Failed (' . print_r( $test_data, true ) . ' - ' . print_r( $discounts->get_discounts(), true ) . ')' ); - - foreach ( $products as $product ) { - $product->delete( true ); - } } /** @@ -1423,13 +1392,5 @@ class WC_Tests_Discounts extends WC_Unit_Test_Case { $this->assertEquals( 20, $discount_total ); remove_filter( 'woocommerce_coupon_get_discount_amount', array( $this, 'filter_woocommerce_coupon_get_discount_amount' ) ); - WC()->cart->empty_cart(); - WC()->cart->remove_coupons(); - $product->delete( true ); - $product2->delete( true ); - $coupon->delete( true ); - - // Temporarily necessary until https://github.com/woocommerce/woocommerce/pull/16767 is implemented. - wp_cache_delete( WC_Cache_Helper::get_cache_prefix( 'coupons' ) . 'coupon_id_from_code_test', 'coupons' ); } } diff --git a/tests/unit-tests/gateways/gateways.php b/tests/unit-tests/gateways/gateways.php index 6eb3254f350..f7ee8b0de8c 100644 --- a/tests/unit-tests/gateways/gateways.php +++ b/tests/unit-tests/gateways/gateways.php @@ -32,9 +32,6 @@ class WC_Tests_Gateways extends WC_Unit_Test_Case { $gateway->supports[] = 'refunds'; $this->assertTrue( $gateway->can_refund_order( $order ) ); - - // Cleanup. - $order->delete( true ); } /** @@ -66,10 +63,6 @@ class WC_Tests_Gateways extends WC_Unit_Test_Case { $order->set_transaction_id( '' ); $order->save(); $this->assertFalse( $gateway->can_refund_order( $order ) ); - - // Cleanup. - delete_option( 'woocommerce_paypal_settings' ); - $order->delete( true ); } } diff --git a/tests/unit-tests/gateways/paypal/request.php b/tests/unit-tests/gateways/paypal/request.php index 3ffc140133e..94615d2b988 100644 --- a/tests/unit-tests/gateways/paypal/request.php +++ b/tests/unit-tests/gateways/paypal/request.php @@ -140,18 +140,6 @@ class WC_Tests_Paypal_Gateway_Request extends WC_Unit_Test_Case { return $this->paypal_request->get_request_url( $this->order, $testmode ); } - /** - * Clean up order, tax, deletes all products in order, too. - */ - protected function clean_up() { - global $wpdb; - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - - WC_Helper_Order::delete_order( $this->order->get_id() ); - unset( $this->products, $this->order ); - } - /** * Check if the shipping tax is included in the total according to $shipping_tax_included. * @@ -221,10 +209,6 @@ class WC_Tests_Paypal_Gateway_Request extends WC_Unit_Test_Case { $this->assertEquals( '_cart', $query_array['cmd'] ); $this->check_shipping_tax( $query_array, $shipping_tax_included ); - - // Remove order and created products. - $this->clean_up(); - } @@ -280,9 +264,6 @@ class WC_Tests_Paypal_Gateway_Request extends WC_Unit_Test_Case { } $this->check_shipping_tax( $query_array, $shipping_tax_included ); - - // Remove order and created products. - $this->clean_up(); } /** diff --git a/tests/unit-tests/order-items/order-item-fee.php b/tests/unit-tests/order-items/order-item-fee.php index 5eefe08c24b..c3af7cd9592 100644 --- a/tests/unit-tests/order-items/order-item-fee.php +++ b/tests/unit-tests/order-items/order-item-fee.php @@ -41,7 +41,6 @@ class WC_Tests_Order_Item_Fee extends WC_Unit_Test_Case { * @since 3.2.0 */ public function test_calculate_taxes() { - global $wpdb; update_option( 'woocommerce_calc_taxes', 'yes' ); $tax_rate = array( 'tax_rate_country' => '', @@ -98,10 +97,5 @@ class WC_Tests_Order_Item_Fee extends WC_Unit_Test_Case { $expected = array( '-0.5' ); $this->assertEquals( $expected, $total_taxes ); $this->assertEquals( '-0.5', $fee->get_total_tax() ); - - // Clean up. - WC_Helper_Order::delete_order( $order->get_id() ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); } } diff --git a/tests/unit-tests/order/coupons.php b/tests/unit-tests/order/coupons.php index c2578d57fff..94e2c2dfc16 100644 --- a/tests/unit-tests/order/coupons.php +++ b/tests/unit-tests/order/coupons.php @@ -16,10 +16,8 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { /** * Setup an order. */ - public function setUp() { - $this->delete_objects(); - - $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; // @codingStandardsIgnoreLine. + protected function init_test() { + $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; update_option( 'woocommerce_default_customer_address', 'base' ); update_option( 'woocommerce_tax_based_on', 'base' ); @@ -117,52 +115,13 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { $order->save(); } - /** - * Clean up after test. - */ - public function tearDown() { - update_option( 'woocommerce_calc_taxes', 'no' ); - update_option( 'woocommerce_prices_include_tax', 'no' ); - $this->delete_objects(); - } - - /** - * delete objects. - */ - protected function delete_objects() { - if ( isset( $this->objects['coupons'] ) ) { - foreach ( $this->objects['coupons'] as $object ) { - $object->delete( true ); - } - } - - if ( isset( $this->objects['products'] ) ) { - foreach ( $this->objects['products'] as $object ) { - $object->delete( true ); - } - } - - if ( isset( $this->objects['order'] ) ) { - $this->objects['order']->delete( true ); - } - - if ( isset( $this->objects['tax_rate_ids'] ) ) { - foreach ( $this->objects['tax_rate_ids'] as $tax_rate_id ) { - WC_Tax::_delete_tax_rate( $tax_rate_id ); - } - } - - $this->objects = array(); - wp_cache_flush(); - } - /** * Test: test_remove_coupon_from_order */ public function test_remove_coupon_from_order() { update_option( 'woocommerce_prices_include_tax', 'yes' ); update_option( 'woocommerce_calc_taxes', 'yes' ); - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -180,7 +139,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { $this->assertEquals( '1000', $order->get_total(), $order->get_total() ); // Reset. - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -202,7 +161,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { public function test_add_coupon_to_order() { update_option( 'woocommerce_prices_include_tax', 'yes' ); update_option( 'woocommerce_calc_taxes', 'yes' ); - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -225,7 +184,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { public function test_remove_coupon_from_order_ex_tax() { update_option( 'woocommerce_prices_include_tax', 'no' ); update_option( 'woocommerce_calc_taxes', 'yes' ); - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -243,7 +202,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { $this->assertEquals( '1100', $order->get_total(), $order->get_total() ); // Reset. - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -265,7 +224,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { public function test_add_coupon_to_order_ex_tax() { update_option( 'woocommerce_prices_include_tax', 'no' ); update_option( 'woocommerce_calc_taxes', 'yes' ); - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -281,7 +240,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { public function test_remove_coupon_from_order_no_tax() { update_option( 'woocommerce_prices_include_tax', 'no' ); update_option( 'woocommerce_calc_taxes', 'no' ); - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -299,7 +258,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { $this->assertEquals( '1000', $order->get_total(), $order->get_total() ); // Reset. - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -321,7 +280,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { public function test_add_coupon_to_order_no_tax() { update_option( 'woocommerce_prices_include_tax', 'no' ); update_option( 'woocommerce_calc_taxes', 'no' ); - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -336,7 +295,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { public function test_remove_coupon_from_order_no_tax_inc_prices_on() { update_option( 'woocommerce_prices_include_tax', 'yes' ); update_option( 'woocommerce_calc_taxes', 'no' ); - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -354,7 +313,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { $this->assertEquals( '1000', $order->get_total(), $order->get_total() ); // Reset. - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); @@ -376,7 +335,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case { public function test_add_coupon_to_order_no_tax_inc_prices_on() { update_option( 'woocommerce_prices_include_tax', 'yes' ); update_option( 'woocommerce_calc_taxes', 'no' ); - $this->setUp(); + $this->init_test(); $order_id = $this->objects['order']->get_id(); $order = wc_get_order( $order_id ); diff --git a/tests/unit-tests/product/data-store.php b/tests/unit-tests/product/data-store.php index 18fa603e285..e1e55d0466b 100644 --- a/tests/unit-tests/product/data-store.php +++ b/tests/unit-tests/product/data-store.php @@ -227,7 +227,6 @@ class WC_Tests_Product_Data_Store extends WC_Unit_Test_Case { $expected_attributes = array( 'pa_size' => array( 'small', 'large' ) ); $this->assertEquals( $expected_attributes, $product->get_variation_attributes() ); - $product->delete(); } /** @@ -315,7 +314,6 @@ class WC_Tests_Product_Data_Store extends WC_Unit_Test_Case { $product->set_name( 'Renamed Variable Product' ); $product->save(); $this->assertEquals( 'Renamed Variable Product', $product->get_name() ); - $product->delete(); } public function test_variation_save_attributes() { @@ -674,11 +672,5 @@ class WC_Tests_Product_Data_Store extends WC_Unit_Test_Case { $this->assertContains( $product2->get_id(), $results ); $this->assertNotContains( $product3->get_id(), $results ); $this->assertNotContains( $product4->get_id(), $results ); - - // Clean up. - $product->delete(); - $product2->delete(); - $product3->delete(); - $product4->delete(); } } diff --git a/tests/unit-tests/product/data.php b/tests/unit-tests/product/data.php index 324ba4b77b0..5b96b20502c 100644 --- a/tests/unit-tests/product/data.php +++ b/tests/unit-tests/product/data.php @@ -100,7 +100,6 @@ class WC_Tests_Product_Data extends WC_Unit_Test_Case { $product->set_image_id( $image_id[0] ); $product->save(); $this->assertEquals( $image_id[0], $product->get_image_id() ); - $product->delete( true ); } /** @@ -224,8 +223,6 @@ class WC_Tests_Product_Data extends WC_Unit_Test_Case { * @since 3.0.0 */ public function test_external_product_getters_and_setters() { - $time = time(); - $getters_and_setters = array( 'button_text' => 'Test Button Text', 'product_url' => 'https://wordpress.org', @@ -269,10 +266,5 @@ class WC_Tests_Product_Data extends WC_Unit_Test_Case { $product = wc_get_product( $product3_id ); $this->assertEquals( $product3_id, $product->get_id() ); $this->assertEquals( '£50.00', $product->get_price_html() ); - - // Clean up. - $product1->delete(); - $product2->delete(); - $product3->delete(); } } diff --git a/tests/unit-tests/shipping-zones/shipping-zone.php b/tests/unit-tests/shipping-zones/shipping-zone.php index cf294829635..632d8569464 100644 --- a/tests/unit-tests/shipping-zones/shipping-zone.php +++ b/tests/unit-tests/shipping-zones/shipping-zone.php @@ -6,100 +6,73 @@ */ class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case { + public function setUp() { + parent::setUp(); + + WC_Helper_Shipping_Zones::create_mock_zones(); + } + /** * Test: WC_Shipping_Zone::get_data */ public function test_get_data() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); $data = $zone->get_data(); // Assert $this->assertTrue( is_array( $data ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_id */ public function test_get_zone_id() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); // Assert $this->assertEquals( $zone->get_id(), 1 ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_zone_name */ public function test_get_zone_name() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); // Assert $this->assertEquals( $zone->get_zone_name(), 'Local' ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_zone_order */ public function test_get_zone_order() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); // Assert $this->assertEquals( $zone->get_zone_order(), 1 ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_zone_locations */ public function test_get_zone_locations() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); // Assert $this->assertTrue( is_array( $zone->get_zone_locations() ) ); $this->assertTrue( 2 === count( $zone->get_zone_locations() ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_formatted_location */ public function test_get_formatted_location() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); @@ -123,18 +96,12 @@ class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case { // Assert $this->assertEquals( $zone->get_formatted_location(), 'United States (US)' ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::get_shipping_methods */ public function test_get_shipping_methods() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); $zone->add_shipping_method( 'flat_rate' ); @@ -143,71 +110,47 @@ class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case { // Assert $this->assertTrue( 1 === count( $methods ) ); $this->assertInstanceOf( 'WC_Shipping_Method', current( $methods ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::set_zone_name */ public function test_set_zone_name() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); $zone->set_zone_name( 'I am a fish' ); // Assert $this->assertEquals( $zone->get_zone_name(), 'I am a fish' ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::set_zone_order */ public function test_set_zone_order() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); $zone->set_zone_order( 100 ); // Assert $this->assertEquals( $zone->get_zone_order(), 100 ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::is_valid_location_type */ public function test_is_valid_location_type() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); // Assert $this->assertEquals( $zone->get_zone_order(), 1 ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::add_location */ public function test_add_location() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); @@ -217,18 +160,12 @@ class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case { $this->assertTrue( $zone->is_valid_location_type( 'continent' ) ); $this->assertTrue( $zone->is_valid_location_type( 'postcode' ) ); $this->assertFalse( $zone->is_valid_location_type( 'poop' ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::clear_locations */ public function test_clear_locations() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); $zone->clear_locations(); @@ -236,18 +173,12 @@ class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case { // Assert $zone_locations = $zone->get_zone_locations(); $this->assertTrue( empty( $zone_locations ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::set_locations */ public function test_set_locations() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); $zone->clear_locations(); @@ -277,18 +208,12 @@ class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case { ), ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::save */ public function test_save() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); $zone->set_zone_name( 'I am a fish' ); @@ -297,18 +222,12 @@ class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case { // Assert $this->assertEquals( $zone->get_zone_name(), 'I am a fish' ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zone::add_shipping_method */ public function test_add_shipping_method() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); $zone->add_shipping_method( 'flat_rate' ); @@ -320,9 +239,6 @@ class WC_Tests_Shipping_Zone extends WC_Unit_Test_Case { // Assert $this->assertTrue( 2 === count( $methods ) ); $this->assertInstanceOf( 'WC_Shipping_Method', current( $methods ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** diff --git a/tests/unit-tests/shipping-zones/shipping-zones.php b/tests/unit-tests/shipping-zones/shipping-zones.php index fe2c1f44ae7..701a733adc6 100644 --- a/tests/unit-tests/shipping-zones/shipping-zones.php +++ b/tests/unit-tests/shipping-zones/shipping-zones.php @@ -6,49 +6,40 @@ */ class WC_Tests_Shipping_Zones extends WC_Unit_Test_Case { + public function setUp() { + parent::setUp(); + + WC_Helper_Shipping_Zones::create_mock_zones(); + } + /** * Test: WC_Shipping_Zones::get_zones */ public function test_get_zones() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zones = WC_Shipping_Zones::get_zones(); // Assert $this->assertTrue( is_array( $zones ) ); $this->assertTrue( 4 === count( $zones ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_zone */ public function test_get_zone() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone( 1 ); // Assert that the first zone is our local zone $this->assertInstanceOf( 'WC_Shipping_Zone', $zone ); $this->assertEquals( $zone->get_zone_name(), 'Local' ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_zone_by */ public function test_get_zone_by() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone_by( 'zone_id', 2 ); @@ -64,18 +55,12 @@ class WC_Tests_Shipping_Zones extends WC_Unit_Test_Case { // Assert $this->assertInstanceOf( 'WC_Shipping_Zone', $zone ); $this->assertEquals( $zone->get_zone_name(), 'Europe' ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_shipping_method */ public function test_get_shipping_method() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone = WC_Shipping_Zones::get_zone_by( 'zone_id', 1 ); $instance_id = $zone->add_shipping_method( 'flat_rate' ); @@ -83,36 +68,24 @@ class WC_Tests_Shipping_Zones extends WC_Unit_Test_Case { // Assert $this->assertInstanceOf( 'WC_Shipping_Flat_Rate', $shipping_method ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::delete_zone */ public function test_delete_zone() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test WC_Shipping_Zones::delete_zone( 1 ); $zones = WC_Shipping_Zones::get_zones(); // Assert $this->assertTrue( 3 === count( $zones ) ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } /** * Test: WC_Shipping_Zones::get_zone_matching_package */ public function test_get_zone_matching_package() { - // Setup - WC_Helper_Shipping_Zones::create_mock_zones(); - // Test $zone1 = WC_Shipping_Zones::get_zone_matching_package( array( @@ -156,8 +129,5 @@ class WC_Tests_Shipping_Zones extends WC_Unit_Test_Case { $this->assertEquals( 'Europe', $zone2->get_zone_name() ); $this->assertEquals( 'California', $zone3->get_zone_name() ); $this->assertEquals( 'US', $zone4->get_zone_name() ); - - // Clean - WC_Helper_Shipping_Zones::remove_mock_zones(); } } diff --git a/tests/unit-tests/tax/tax.php b/tests/unit-tests/tax/tax.php index 74795fc48c3..3a3406ef9ab 100644 --- a/tests/unit-tests/tax/tax.php +++ b/tests/unit-tests/tax/tax.php @@ -10,11 +10,6 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { * Get rates. */ public function test_get_rates() { - global $wpdb; - - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - $customer_location = WC_Tax::get_tax_location(); $tax_rate = array( 'tax_rate_country' => $customer_location[0], @@ -70,19 +65,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { ), ) ); - - WC_Tax::_delete_tax_rate( $tax_rate_catch_all_id ); } /** * Get rates. */ public function test_get_shipping_tax_rates() { - global $wpdb; - - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - $customer_location = WC_Tax::get_tax_location(); $tax_rate = array( 'tax_rate_country' => $customer_location[0], @@ -110,19 +98,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { ), ), print_r( $tax_rates, true ) ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Get rates. */ public function test_get_base_tax_rates() { - global $wpdb; - - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -149,19 +130,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { ), ) ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Find tax rates. */ public function test_find_rates() { - global $wpdb; - - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -196,19 +170,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { ), ) ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Find tax rates. */ public function test_find_shipping_rates() { - global $wpdb; - - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -243,19 +210,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { ), ) ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Test tax amounts. */ public function test_calc_tax() { - global $wpdb; - - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -287,19 +247,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $calced_tax = WC_Tax::calc_tax( '9.99', $tax_rates, false, false ); $this->assertEquals( $calced_tax, array( $tax_rate_id => '1.998' ) ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Test compound tax amounts */ public function test_calc_compound_tax() { - global $wpdb; - - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - update_option( 'woocommerce_default_country', 'CA' ); update_option( 'woocommerce_default_state', 'QC' ); @@ -360,22 +313,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { */ $this->assertEquals( round( $calced_tax[ $tax_rate_1_id ], 4 ), 4.3889 ); $this->assertEquals( round( $calced_tax[ $tax_rate_2_id ], 4 ), 7.8341 ); - - WC_Tax::_delete_tax_rate( $tax_rate_1_id ); - WC_Tax::_delete_tax_rate( $tax_rate_2_id ); - update_option( 'woocommerce_default_country', 'GB' ); - update_option( 'woocommerce_default_state', '' ); } /** * Shipping tax amounts. */ public function test_calc_shipping_tax() { - global $wpdb; - - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" ); - $wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" ); - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -403,16 +346,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $calced_tax = WC_Tax::calc_shipping_tax( '10', $tax_rates ); $this->assertEquals( $calced_tax, array( $tax_rate_id => '2' ) ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Test rate labels. */ public function test_get_rate_label() { - global $wpdb; - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -428,16 +367,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate ); $this->assertEquals( WC_Tax::get_rate_label( $tax_rate_id ), 'VAT' ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Test rate percent. */ public function test_get_rate_percent() { - global $wpdb; - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -453,16 +388,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate ); $this->assertEquals( WC_Tax::get_rate_percent( $tax_rate_id ), '20%' ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Test rate code. */ public function test_get_rate_code() { - global $wpdb; - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -478,16 +409,12 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate ); $this->assertEquals( WC_Tax::get_rate_code( $tax_rate_id ), 'GB-VAT-1' ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** * Test is compound. */ public function test_is_compound() { - global $wpdb; - $tax_rate = array( 'tax_rate_country' => 'GB', 'tax_rate_state' => '', @@ -503,8 +430,6 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate ); $this->assertTrue( WC_Tax::is_compound( $tax_rate_id ) ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** @@ -572,8 +497,6 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $this->assertEquals( $new_row->tax_rate_shipping, '1' ); $this->assertEquals( $new_row->tax_rate_order, '1' ); $this->assertEquals( $new_row->tax_rate_class, '' ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** @@ -607,8 +530,6 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { WC_Tax::_update_tax_rate( $tax_rate_id, $tax_rate ); $this->assertNotFalse( $wpdb->last_result ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** @@ -637,8 +558,6 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { WC_Tax::_delete_tax_rate( $tax_rate_id ); $this->assertNotFalse( $wpdb->last_result ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** @@ -668,8 +587,6 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $results = $wpdb->get_col( $wpdb->prepare( "SELECT location_code FROM {$wpdb->prefix}woocommerce_tax_rate_locations WHERE tax_rate_id = %d ORDER BY location_code ASC", $tax_rate_id ) ); $this->assertEquals( array( '12345', '90210...90215' ), $results ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } /** @@ -699,7 +616,5 @@ class WC_Tests_Tax extends WC_Unit_Test_Case { $results = $wpdb->get_col( $wpdb->prepare( "SELECT location_code FROM {$wpdb->prefix}woocommerce_tax_rate_locations WHERE tax_rate_id = %d ORDER BY location_code ASC", $tax_rate_id ) ); $this->assertEquals( array( 'SOMEWHERE', 'SOMEWHERE_ELSE' ), $results ); - - WC_Tax::_delete_tax_rate( $tax_rate_id ); } } diff --git a/tests/unit-tests/totals/totals.php b/tests/unit-tests/totals/totals.php index 30caa98e108..5536db26403 100644 --- a/tests/unit-tests/totals/totals.php +++ b/tests/unit-tests/totals/totals.php @@ -32,10 +32,6 @@ class WC_Tests_Totals extends WC_Unit_Test_Case { $this->ids = array(); - if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) { - define( 'WOOCOMMERCE_CHECKOUT', 1 ); - } - $tax_rate = array( 'tax_rate_country' => '', 'tax_rate_state' => '', @@ -110,23 +106,9 @@ class WC_Tests_Totals extends WC_Unit_Test_Case { WC()->cart->empty_cart(); WC()->session->set( 'chosen_shipping_methods', array() ); WC_Helper_Shipping::delete_simple_flat_rate(); - update_option( 'woocommerce_calc_taxes', 'no' ); remove_action( 'woocommerce_cart_calculate_fees', array( $this, 'add_cart_fees_callback' ) ); - foreach ( $this->ids['products'] as $product ) { - $product->delete( true ); - } - - foreach ( $this->ids['coupons'] as $coupon ) { - $coupon->delete( true ); - wp_cache_delete( WC_Cache_Helper::get_cache_prefix( 'coupons' ) . 'coupon_id_from_code_' . $coupon->get_code(), 'coupons' ); - } - - foreach ( $this->ids['tax_rate_ids'] as $tax_rate_id ) { - WC_Tax::_delete_tax_rate( $tax_rate_id ); - } - - $this->ids = array(); + parent::tearDown(); } /** diff --git a/tests/unit-tests/util/class-wc-tests-wc-query.php b/tests/unit-tests/util/class-wc-tests-wc-query.php index eb007c1a2f3..a2ff4596519 100644 --- a/tests/unit-tests/util/class-wc-tests-wc-query.php +++ b/tests/unit-tests/util/class-wc-tests-wc-query.php @@ -65,9 +65,6 @@ class WC_Tests_WC_Query extends WC_Unit_Test_Case { WC()->query->init_query_vars(); $updated_vars = WC()->query->get_query_vars(); $this->assertEquals( 'order-pay-new', $updated_vars['order-pay'] ); - - // Clean up. - update_option( 'woocommerce_checkout_pay_endpoint', 'order-pay' ); } /**