fixing broken unit tests, mostly resolving around use of base API path being missing from mocking expectations. should not cause brokenness in live code. ALSO renamed createOptionsets_Options to match PSR2

bc-bfenton · bc-bfenton · commit 13915b7e26ae · 2015-05-11T14:55:58.000-07:00
diff --git a/src/Bigcommerce/Api/Client.php b/src/Bigcommerce/Api/Client.php
@@ -979,7 +979,7 @@ public static function createOptionsets($object)
      * @param $id
      * @return mixed
      */
-    public static function createOptionsets_Options($object, $id)
+    public static function createOptionsetsOptions($object, $id)
     {
         return self::createResource('/optionsets/' . $id . '/options', $object);
     }
diff --git a/test/Unit/Api/ClientTest.php b/test/Unit/Api/ClientTest.php
diff --git a/test/Unit/Api/Resources/BrandTest.php b/test/Unit/Api/Resources/BrandTest.php
@@ -11,7 +11,7 @@ public function testCreatePassesThroughToConnection()
         $brand = new Brand();
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/brands', $brand->getCreateFields());
+            ->with($this->basePath . '/brands', $brand->getCreateFields());
 
         $brand->create();
     }
@@ -21,7 +21,7 @@ public function testUpdatePassesThroughToConnection()
         $brand = new Brand((object)(array('id' => 1)));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/brands/1', $brand->getUpdateFields());
+            ->with($this->basePath . '/brands/1', $brand->getUpdateFields());
 
         $brand->update();
     }
diff --git a/test/Unit/Api/Resources/CategoryTest.php b/test/Unit/Api/Resources/CategoryTest.php
@@ -11,7 +11,7 @@ public function testCreatePassesThroughToConnection()
         $category = new Category();
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/categories', $category->getCreateFields());
+            ->with($this->basePath . '/categories', $category->getCreateFields());
 
         $category->create();
     }
@@ -21,7 +21,7 @@ public function testUpdatePassesThroughToConnection()
         $category = new Category((object)(array('id' => 1)));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/categories/1', $category->getUpdateFields());
+            ->with($this->basePath . '/categories/1', $category->getUpdateFields());
 
         $category->update();
     }
diff --git a/test/Unit/Api/Resources/CouponTest.php b/test/Unit/Api/Resources/CouponTest.php
@@ -11,7 +11,7 @@ public function testCreatePassesThroughToConnection()
         $coupon = new Coupon();
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/coupons', $coupon->getCreateFields());
+            ->with($this->basePath . '/coupons', $coupon->getCreateFields());
 
         $coupon->create();
     }
@@ -21,7 +21,7 @@ public function testUpdatePassesThroughToConnection()
         $coupon = new Coupon((object)(array('id' => 1)));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/coupons/1', $coupon->getUpdateFields());
+            ->with($this->basePath . '/coupons/1', $coupon->getUpdateFields());
 
         $coupon->update();
     }
diff --git a/test/Unit/Api/Resources/CustomerTest.php b/test/Unit/Api/Resources/CustomerTest.php
@@ -11,7 +11,7 @@ public function testAddressesPassesThroughToConnection()
         $customer = new Customer((object)array('addresses' => (object)array('resource' => '/customers/1/addresses')));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/customers/1/addresses')
+            ->with($this->basePath . '/customers/1/addresses')
             ->will($this->returnValue(array(array(), array())));
 
         foreach ($customer->addresses as $address) {
@@ -24,7 +24,7 @@ public function testCreatePassesThroughToConnection()
         $customer = new Customer();
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/customers', $customer->getCreateFields());
+            ->with($this->basePath . '/customers', $customer->getCreateFields());
 
         $customer->create();
     }
@@ -34,7 +34,7 @@ public function testUpdatePassesThroughToConnection()
         $customer = new Customer((object)(array('id' => 1)));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/customers/1', $customer->getUpdateFields());
+            ->with($this->basePath . '/customers/1', $customer->getUpdateFields());
 
         $customer->update();
     }
@@ -44,7 +44,7 @@ public function testDeletePassesThroughToConnection()
         $customer = new Customer((object)(array('id' => 1)));
         $this->connection->expects($this->once())
             ->method('delete')
-            ->with('/customers/1');
+            ->with($this->basePath . '/customers/1');
 
         $customer->delete();
     }
diff --git a/test/Unit/Api/Resources/OptionSetOptionTest.php b/test/Unit/Api/Resources/OptionSetOptionTest.php
@@ -11,7 +11,7 @@ public function testOptionPassesThroughToConnection()
         $optionsetoption = new OptionSetOption((object)array('option' => (object)array('resource' => '/options/1')));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/options/1')
+            ->with($this->basePath . '/options/1')
             ->will($this->returnValue(array(array())));
 
         $this->assertInstanceOf('Bigcommerce\\Api\\Resources\\Option', $optionsetoption->option);
@@ -22,7 +22,7 @@ public function testCreatePassesThroughToConnection()
         $optionsetoption = new OptionSetOption();
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/optionsets/options', $optionsetoption->getCreateFields());
+            ->with($this->basePath . '/optionsets/options', $optionsetoption->getCreateFields());
 
         $optionsetoption->create();
     }
@@ -32,7 +32,7 @@ public function testUpdatePassesThroughToConnection()
         $optionsetoption = new OptionSetOption((object)(array('id' => 1)));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/optionsets/options/1', $optionsetoption->getUpdateFields());
+            ->with($this->basePath . '/optionsets/options/1', $optionsetoption->getUpdateFields());
 
         $optionsetoption->update();
     }
diff --git a/test/Unit/Api/Resources/OptionSetTest.php b/test/Unit/Api/Resources/OptionSetTest.php
@@ -11,7 +11,7 @@ public function testOptionsPassesThroughToConnection()
         $optionset = new OptionSet((object)array('options' => (object)array('resource' => '/optionsets/1/options')));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/optionsets/1/options')
+            ->with($this->basePath . '/optionsets/1/options')
             ->will($this->returnValue(array(array(), array())));
 
         foreach ($optionset->options as $value) {
@@ -24,7 +24,7 @@ public function testCreatePassesThroughToConnection()
         $optionset = new OptionSet();
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/optionsets', $optionset->getCreateFields());
+            ->with($this->basePath . '/optionsets', $optionset->getCreateFields());
 
         $optionset->create();
     }
@@ -34,7 +34,7 @@ public function testUpdatePassesThroughToConnection()
         $optionset = new OptionSet((object)array('id' => 1));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/optionsets/1', $optionset->getUpdateFields());
+            ->with($this->basePath . '/optionsets/1', $optionset->getUpdateFields());
 
         $optionset->update();
     }
diff --git a/test/Unit/Api/Resources/OptionTest.php b/test/Unit/Api/Resources/OptionTest.php
@@ -11,7 +11,7 @@ public function testValuesPassesThroughToConnection()
         $option = new Option((object)array('values' => (object)array('resource' => '/options/1/values')));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/options/1/values')
+            ->with($this->basePath . '/options/1/values')
             ->will($this->returnValue(array(array(), array())));
 
         foreach ($option->values as $value) {
diff --git a/test/Unit/Api/Resources/OptionValueTest.php b/test/Unit/Api/Resources/OptionValueTest.php
@@ -11,7 +11,7 @@ public function testOptionPassesThroughToConnection()
         $optionvalue = new OptionValue((object)array('option_id' => 1));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/options/1')
+            ->with($this->basePath . '/options/1')
             ->will($this->returnValue(array(array())));
 
         $this->assertInstanceOf('Bigcommerce\\Api\\Resources\\Option', $optionvalue->option);
@@ -23,7 +23,7 @@ public function testCreatePassesThroughToConnection()
         $optionvalue = new OptionValue((object)array('option_id' => 1));
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/options/1/values', $optionvalue->getCreateFields());
+            ->with($this->basePath . '/options/1/values', $optionvalue->getCreateFields());
 
         $optionvalue->create();
     }
@@ -34,7 +34,7 @@ public function testUpdatePassesThroughToConnection()
         $optionvalue = new OptionValue((object)array('id' => 1, 'option_id' => 1));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/options/1/values/1', $optionvalue->getUpdateFields());
+            ->with($this->basePath . '/options/1/values/1', $optionvalue->getUpdateFields());
 
         $optionvalue->update();
     }
diff --git a/test/Unit/Api/Resources/OrderTest.php b/test/Unit/Api/Resources/OrderTest.php
@@ -11,7 +11,7 @@ public function testUpdatePassesThroughToConnection()
         $order = new Order((object)(array('id' => 1, 'status_id' => 5, 'is_deleted' => false)));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/orders/1', (object)array('status_id' => 5, 'is_deleted' => false));
+            ->with($this->basePath . '/orders/1', (object)array('status_id' => 5, 'is_deleted' => false));
 
         $order->update();
     }
@@ -21,7 +21,7 @@ public function testShipmentsPassesThroughToConnection()
         $order = new Order((object)array('id' => 1));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/orders/1/shipments', false)
+            ->with($this->basePath . '/orders/1/shipments', false)
             ->will($this->returnValue(array(array(), array())));
 
         foreach ($order->shipments as $shipment) {
@@ -34,7 +34,7 @@ public function testProductsPassesThroughToConnection()
         $order = new Order((object)array('products' => (object)array('resource' => '/orders/1/products')));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/orders/1/products')
+            ->with($this->basePath . '/orders/1/products')
             ->will($this->returnValue(array(array(), array())));
 
         foreach ($order->products as $product) {
@@ -44,10 +44,12 @@ public function testProductsPassesThroughToConnection()
 
     public function testShippingAddressesPassesThroughToConnection()
     {
-        $order = new Order((object)array('shipping_addresses' => (object)array('resource' => '/orders/1/shippingaddresses')));
+        $order = new Order((object)array(
+            'shipping_addresses' => (object)array('resource' => '/orders/1/shippingaddresses')
+        ));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/orders/1/shippingaddresses')
+            ->with($this->basePath . '/orders/1/shippingaddresses')
             ->will($this->returnValue(array(array(), array())));
 
         foreach ($order->shipping_addresses as $address) {
@@ -60,7 +62,7 @@ public function testCouponsPassesThroughToConnection()
         $order = new Order((object)array('coupons' => (object)array('resource' => '/orders/1/coupons')));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/orders/1/coupons')
+            ->with($this->basePath . '/orders/1/coupons')
             ->will($this->returnValue(array(array(), array())));
 
         foreach ($order->coupons as $coupon) {
diff --git a/test/Unit/Api/Resources/ProductCustomFieldTest.php b/test/Unit/Api/Resources/ProductCustomFieldTest.php
@@ -12,7 +12,7 @@ public function testCreatePassesThroughToConnection()
         $customfield = new ProductCustomField((object)array('product_id' => 1));
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/products/1/customfields', $customfield->getCreateFields());
+            ->with($this->basePath . '/products/1/customfields', $customfield->getCreateFields());
 
         $customfield->create();
     }
@@ -23,7 +23,7 @@ public function testUpdatePassesThroughToConnection()
         $customfield = new ProductCustomField((object)(array('id' => 1, 'product_id' => 1)));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/products/1/customfields/1', $customfield->getUpdateFields());
+            ->with($this->basePath . '/products/1/customfields/1', $customfield->getUpdateFields());
 
         $customfield->update();
     }
@@ -33,7 +33,7 @@ public function testDeletePassesThroughToConnection()
         $customfield = new ProductCustomField((object)(array('id' => 1, 'product_id' => 1)));
         $this->connection->expects($this->once())
             ->method('delete')
-            ->with('/products/1/customfields/1');
+            ->with($this->basePath . '/products/1/customfields/1');
 
         $customfield->delete();
     }
diff --git a/test/Unit/Api/Resources/ProductImageTest.php b/test/Unit/Api/Resources/ProductImageTest.php
@@ -12,7 +12,7 @@ public function testCreatePassesThroughToConnection()
         $customfield = new ProductImage((object)array('product_id' => 1));
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/products/1/images', $customfield->getCreateFields());
+            ->with($this->basePath . '/products/1/images', $customfield->getCreateFields());
 
         $customfield->create();
     }
@@ -23,7 +23,7 @@ public function testUpdatePassesThroughToConnection()
         $customfield = new ProductImage((object)(array('id' => 1, 'product_id' => 1)));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/products/1/images/1', $customfield->getUpdateFields());
+            ->with($this->basePath . '/products/1/images/1', $customfield->getUpdateFields());
 
         $customfield->update();
     }
diff --git a/test/Unit/Api/Resources/ProductOptionTest.php b/test/Unit/Api/Resources/ProductOptionTest.php
@@ -8,12 +8,12 @@ class ProductOptionTest extends ResourceTestBase
 {
     public function testValuesPassesThroughToConnection()
     {
-        $productoption = new ProductOption((object)array('option_id' => 1));
+        $productOption = new ProductOption((object)array('option_id' => 1));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with('/options/1')
+            ->with($this->basePath . '/options/1')
             ->will($this->returnValue(array(array())));
 
-        $this->assertInstanceOf('Bigcommerce\\Api\\Resources\\Option', $productoption->option);
+        $this->assertInstanceOf('Bigcommerce\\Api\\Resources\\Option', $productOption->option);
     }
 }
diff --git a/test/Unit/Api/Resources/ProductTest.php b/test/Unit/Api/Resources/ProductTest.php
@@ -11,7 +11,7 @@ public function testCreatePassesThroughToConnection()
         $product = new Product((object)array('id' => 1));
         $this->connection->expects($this->once())
             ->method('post')
-            ->with('/products', (object)array('id' => 1));
+            ->with($this->basePath . '/products', (object)array('id' => 1));
 
         $product->create();
     }
@@ -21,7 +21,7 @@ public function testUpdatePassesThroughToConnection()
         $product = new Product((object)array('id' => 1));
         $this->connection->expects($this->once())
             ->method('put')
-            ->with('/products/1', (object)array());
+            ->with($this->basePath . '/products/1', (object)array());
 
         $product->update();
     }
@@ -31,7 +31,7 @@ public function testDeletePassesThroughToConnection()
         $product = new Product((object)array('id' => 1));
         $this->connection->expects($this->once())
             ->method('delete')
-            ->with('/products/1');
+            ->with($this->basePath . '/products/1');
 
         $product->delete();
     }
@@ -59,7 +59,7 @@ public function testPropertyCollectionsPassThroughToTheConnection($property, $cl
         $product = new Product((object)array('id' => 1, $property => (object)array('resource' => $url)));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with($url)
+            ->with($this->basePath . $url)
             ->will($this->returnValue(array(array(), array())));
 
         $collection = $product->$property;
@@ -87,7 +87,7 @@ public function testPropertiesPassThroughToTheConnection($property, $className)
         $product = new Product((object)array($property => (object)array('resource' => $url)));
         $this->connection->expects($this->once())
             ->method('get')
-            ->with($url)
+            ->with($this->basePath . $url)
             ->will($this->returnValue(array(array())));
 
         $this->assertInstanceOf('Bigcommerce\\Api\\Resources\\' . $className, $product->$property);
diff --git a/test/Unit/Api/Resources/ResourceTestBase.php b/test/Unit/Api/Resources/ResourceTestBase.php
@@ -2,10 +2,15 @@
 namespace Bigcommerce\Test\Unit\Api\Resources;
 
 use Bigcommerce\Api\Client;
+use Bigcommerce\Api\Connection;
 
 class ResourceTestBase extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var Connection|\PHPUnit_Framework_MockObject_MockObject
+     */
     protected $connection;
+    protected $basePath = '';
 
     public function setUp()
     {
@@ -34,6 +39,7 @@ public function setUp()
             ->disableOriginalConstructor()
             ->setMethods($methods)
             ->getMock();
+        $this->basePath = $this->getStaticAttribute('Bigcommerce\\Api\\Client', 'api_path');
         Client::setConnection($this->connection);
     }
-}
+}
diff --git a/test/Unit/Api/Resources/RuleConditionTest.php b/test/Unit/Api/Resources/RuleConditionTest.php
diff --git a/test/Unit/Api/Resources/RuleTest.php b/test/Unit/Api/Resources/RuleTest.php
diff --git a/test/Unit/Api/Resources/ShipmentTest.php b/test/Unit/Api/Resources/ShipmentTest.php
diff --git a/test/Unit/Api/Resources/SkuOptionTest.php b/test/Unit/Api/Resources/SkuOptionTest.php
diff --git a/test/Unit/Api/Resources/SkuTest.php b/test/Unit/Api/Resources/SkuTest.php

Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ public static function createOptionsets($object)`
`979`	`979`	`* @param $id`
`980`	`980`	`* @return mixed`
`981`	`981`	`*/`
`982`		`- public static function createOptionsets_Options($object, $id)`
	`982`	`+ public static function createOptionsetsOptions($object, $id)`
`983`	`983`	`{`
`984`	`984`	`return self::createResource('/optionsets/' . $id . '/options', $object);`
`985`	`985`	`}`