Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests

This commit is contained in:
Mike Jolley 2017-12-21 19:00:55 +00:00
parent 6fd3d9c100
commit e9105bd37d
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/class-wc-customer.php
View File

@ -270,7 +270,7 @@ class WC_Customer extends WC_Legacy_Customer {
* @param bool $is_vat_exempt * @param bool $is_vat_exempt
*/ */
public function set_is_vat_exempt( $is_vat_exempt ) { public function set_is_vat_exempt( $is_vat_exempt ) {
$this->is_vat_exempt = (bool) $is_vat_exempt; $this->is_vat_exempt = wc_string_to_bool( $is_vat_exempt );
} }
/** /**
@ -279,7 +279,7 @@ class WC_Customer extends WC_Legacy_Customer {
* @param boolean $calculated * @param boolean $calculated
*/ */
public function set_calculated_shipping( $calculated = true ) { public function set_calculated_shipping( $calculated = true ) {
$this->calculated_shipping = (bool) $calculated; $this->calculated_shipping = wc_string_to_bool( $calculated );
} }
/** /**

9
includes/data-stores/class-wc-customer-data-store-session.php
View File

@ -77,9 +77,7 @@ class WC_Customer_Data_Store_Session extends WC_Data_Store_WP implements WC_Cust
} }
$data[ $session_key ] = (string) $customer->{"get_$function_key"}( 'edit' ); $data[ $session_key ] = (string) $customer->{"get_$function_key"}( 'edit' );
} }
if ( WC()->session->get( 'customer' ) !== $data ) { WC()->session->set( 'customer', $data );
WC()->session->set( 'customer', $data );
}
} }
/** /**
@ -97,8 +95,11 @@ class WC_Customer_Data_Store_Session extends WC_Data_Store_WP implements WC_Cust
* *
* If the user object has been updated since the session was created (based on date_modified) we should not load the session - data should be reloaded. * If the user object has been updated since the session was created (based on date_modified) we should not load the session - data should be reloaded.
*/ */
if ( ! empty( $data ) && isset( $data['id'], $data['date_modified'] ) && $data['id'] === (string) $customer->get_id() && $data['date_modified'] === (string) $customer->get_date_modified( 'edit' ) ) { if ( isset( $data['id'], $data['date_modified'] ) && $data['id'] === (string) $customer->get_id() && $data['date_modified'] === (string) $customer->get_date_modified( 'edit' ) ) {
foreach ( $this->session_keys as $session_key ) { foreach ( $this->session_keys as $session_key ) {
if ( in_array( $session_key, array( 'id', 'date_modified' ), true ) ) {
continue;
}
$function_key = $session_key; $function_key = $session_key;
if ( 'billing_' === substr( $session_key, 0, 8 ) ) { if ( 'billing_' === substr( $session_key, 0, 8 ) ) {
$session_key = str_replace( 'billing_', '', $session_key ); $session_key = str_replace( 'billing_', '', $session_key );

5
tests/framework/helpers/class-wc-helper-customer.php
View File

@ -13,9 +13,9 @@ class WC_Helper_Customer {
* @return WC_Customer * @return WC_Customer
*/ */
public static function create_mock_customer() { public static function create_mock_customer() {
$customer_data = array( $customer_data = array(
'id' => 0, 'id' => 0,
'date_modified' => null,
'country' => 'US', 'country' => 'US',
'state' => 'PA', 'state' => 'PA',
'postcode' => '19123', 'postcode' => '19123',
@ -35,6 +35,7 @@ class WC_Helper_Customer {
WC_Helper_Customer::set_customer_details( $customer_data ); WC_Helper_Customer::set_customer_details( $customer_data );
$customer = new WC_Customer( 0, true ); $customer = new WC_Customer( 0, true );
return $customer; return $customer;
} }
@ -105,7 +106,7 @@ class WC_Helper_Customer {
* @param string $default_shipping_method Shipping Method slug * @param string $default_shipping_method Shipping Method slug
*/ */
public static function set_customer_details( $customer_details ) { public static function set_customer_details( $customer_details ) {
WC()->session->set( 'customer', $customer_details ); WC()->session->set( 'customer', array_map( 'strval', $customer_details ) );
} }
/** /**

3
tests/unit-tests/customer/crud.php
View File

@ -442,8 +442,7 @@ class WC_Tests_CustomerCRUD extends WC_Unit_Test_Case {
* @since 3.0.0 * @since 3.0.0
*/ */
public function test_customer_sessions() { public function test_customer_sessions() {
$customer = WC_Helper_Customer::create_customer(); $session = WC_Helper_Customer::create_mock_customer(); // set into session....
$session = WC_Helper_Customer::create_mock_customer(); // set into session....
$this->assertEquals( '19123', $session->get_billing_postcode() ); $this->assertEquals( '19123', $session->get_billing_postcode() );
$this->assertEquals( '123 South Street', $session->get_billing_address() ); $this->assertEquals( '123 South Street', $session->get_billing_address() );