From a1f2c867f40a125a6564ab1cf51df89dbb8506fa Mon Sep 17 00:00:00 2001 From: Peter Fabian Date: Fri, 2 Nov 2018 12:24:21 +0100 Subject: [PATCH] Corrected failing tests. --- .../reports/class-wc-tests-reports-orders.php | 47 ++++++++++++------- .../class-wc-tests-reports-revenue-stats.php | 23 +++++---- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-orders.php b/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-orders.php index 2aea9ebc200..ce52cfedbe6 100644 --- a/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-orders.php +++ b/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-orders.php @@ -67,16 +67,18 @@ class WC_Tests_Reports_Orders extends WC_Unit_Test_Case { 'date_end' => $end_time, 'date_end_gmt' => $end_time, 'subtotals' => array( - 'gross_revenue' => 97, - 'net_revenue' => 80, - 'coupons' => 20, - 'shipping' => 10, - 'taxes' => 7, - 'refunds' => 0, - 'orders_count' => 1, - 'num_items_sold' => 4, - 'avg_items_per_order' => 4, - 'avg_order_value' => 97, + 'gross_revenue' => 97, + 'net_revenue' => 80, + 'coupons' => 20, + 'shipping' => 10, + 'taxes' => 7, + 'refunds' => 0, + 'orders_count' => 1, + 'num_items_sold' => 4, + 'avg_items_per_order' => 4, + 'avg_order_value' => 97, + 'num_returning_customers' => 0, + 'num_new_customers' => 1, ), ), ), @@ -92,10 +94,15 @@ class WC_Tests_Reports_Orders extends WC_Unit_Test_Case { $query = new WC_Admin_Reports_Orders_Stats_Query( $args ); $expected_stats = array( 'totals' => array( - 'net_revenue' => 80, - 'avg_order_value' => 97, - 'orders_count' => 1, - 'avg_items_per_order' => 4, + 'net_revenue' => 80, + 'avg_order_value' => 97, + 'orders_count' => 1, + 'avg_items_per_order' => 4, + 'num_items_sold' => 4, + 'coupons' => 20, + 'num_returning_customers' => 0, + 'num_new_customers' => 1, + 'products' => '1', ), 'intervals' => array( array( @@ -105,10 +112,14 @@ class WC_Tests_Reports_Orders extends WC_Unit_Test_Case { 'date_end' => $end_time, 'date_end_gmt' => $end_time, 'subtotals' => array( - 'net_revenue' => 80, - 'avg_order_value' => 97, - 'orders_count' => 1, - 'avg_items_per_order' => 4, + 'net_revenue' => 80, + 'avg_order_value' => 97, + 'orders_count' => 1, + 'avg_items_per_order' => 4, + 'num_items_sold' => 4, + 'coupons' => 20, + 'num_returning_customers' => 0, + 'num_new_customers' => 1, ), ), ), diff --git a/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-revenue-stats.php b/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-revenue-stats.php index 405045f1d7a..390caa2b38f 100644 --- a/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-revenue-stats.php +++ b/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-revenue-stats.php @@ -70,16 +70,18 @@ class WC_Admin_Tests_Reports_Revenue_Stats extends WC_Unit_Test_Case { 'date_end' => $end_time, 'date_end_gmt' => $end_time, 'subtotals' => array( - 'orders_count' => 1, - 'num_items_sold' => 4, - 'gross_revenue' => 97, - 'coupons' => 20, - 'refunds' => 0, - 'taxes' => 7, - 'shipping' => 10, - 'net_revenue' => 80, - 'avg_items_per_order' => 4, - 'avg_order_value' => 97, + 'orders_count' => 1, + 'num_items_sold' => 4, + 'gross_revenue' => 97, + 'coupons' => 20, + 'refunds' => 0, + 'taxes' => 7, + 'shipping' => 10, + 'net_revenue' => 80, + 'avg_items_per_order' => 4, + 'avg_order_value' => 97, + 'num_returning_customers' => 0, + 'num_new_customers' => 1, ), ), ), @@ -102,6 +104,7 @@ class WC_Admin_Tests_Reports_Revenue_Stats extends WC_Unit_Test_Case { 'taxes' => 7, 'shipping' => 10, 'net_revenue' => 80, + 'products' => '1', ), 'intervals' => array( array(