From 8a9ab7ffea002ab877fa1d62acfe374ace91a36b Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Tue, 5 May 2015 09:01:34 -0300 Subject: [PATCH] Fixed get_woocommerce_api_url() for the new API versions numbers and fixed the tests @mikejolley --- includes/wc-core-functions.php | 3 ++- tests/unit-tests/util/core-functions.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/wc-core-functions.php b/includes/wc-core-functions.php index 34e49f171f1..2f41f9f8e2f 100644 --- a/includes/wc-core-functions.php +++ b/includes/wc-core-functions.php @@ -563,7 +563,8 @@ function wc_setcookie( $name, $value, $expire = 0, $secure = false ) { */ function get_woocommerce_api_url( $path ) { - $version = defined( 'WC_API_REQUEST_VERSION' ) ? WC_API_REQUEST_VERSION : WC_API::VERSION; + $_version = substr( WC_API::VERSION, 0, 1 ); + $version = defined( 'WC_API_REQUEST_VERSION' ) ? WC_API_REQUEST_VERSION : $_version; $url = get_home_url( null, "wc-api/v{$version}/", is_ssl() ? 'https' : 'http' ); diff --git a/tests/unit-tests/util/core-functions.php b/tests/unit-tests/util/core-functions.php index ff4aefce3fc..94b155cc21b 100644 --- a/tests/unit-tests/util/core-functions.php +++ b/tests/unit-tests/util/core-functions.php @@ -107,10 +107,10 @@ class Core_Functions extends \WC_Unit_Test_Case { $base_uri = get_home_url(); // base uri - $this->assertEquals( "$base_uri/wc-api/v2.1.0/", get_woocommerce_api_url( null ) ); + $this->assertEquals( "$base_uri/wc-api/v2/", get_woocommerce_api_url( null ) ); // path - $this->assertEquals( "$base_uri/wc-api/v2.1.0/orders", get_woocommerce_api_url( 'orders' ) ); + $this->assertEquals( "$base_uri/wc-api/v2/orders", get_woocommerce_api_url( 'orders' ) ); } /**