From 1ec96093a1aa1a6d1132c30d5a5c6f766336a787 Mon Sep 17 00:00:00 2001
From: bc-joshroe <joshua.roe@bigcommerce.com>
Date: Wed, 4 Mar 2015 10:40:30 -0800
Subject: [PATCH 1/2] Adding getOrderStatus

---
 src/Bigcommerce/Api/Client.php | 12 +++++++++++-
 test/Unit/Api/ClientTest.php   | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Bigcommerce/Api/Client.php b/src/Bigcommerce/Api/Client.php
index 7042bdb2..80ba2ea0 100644
--- a/src/Bigcommerce/Api/Client.php
+++ b/src/Bigcommerce/Api/Client.php
@@ -960,6 +960,16 @@ public static function getOptionSet($id)
         return self::getResource('/optionsets/' . $id, 'OptionSet');
     }
 
+    /**
+     * Status codes used to represent the state of an order.
+     *
+     * @return array
+     */
+    public static function getOrderStatus($id)
+    {
+        return self::getResource('/order_statuses/' . $id, 'OrderStatus');
+    }
+
     /**
      * Status codes used to represent the state of an order.
      *
@@ -967,7 +977,7 @@ public static function getOptionSet($id)
      */
     public static function getOrderStatuses()
     {
-        return self::getCollection('/orderstatuses', 'OrderStatus');
+        return self::getCollection('/order_statuses', 'OrderStatus');
     }
 
     /**
diff --git a/test/Unit/Api/ClientTest.php b/test/Unit/Api/ClientTest.php
index 405ce6e5..0000e6bc 100644
--- a/test/Unit/Api/ClientTest.php
+++ b/test/Unit/Api/ClientTest.php
@@ -243,7 +243,7 @@ public function collections()
             array('orders', 'getOrders', 'Order'),
             array('customers', 'getCustomers', 'Customer'),
             array('coupons', 'getCoupons', 'Coupon'),
-            array('orderstatuses', 'getOrderStatuses', 'OrderStatus'),
+            array('order_statuses', 'getOrderStatuses', 'OrderStatus'),
             array('categories', 'getCategories', 'Category'),
             array('options', 'getOptions', 'Option'),
             array('optionsets', 'getOptionSets', 'OptionSet'),
@@ -274,7 +274,7 @@ public function testGettingASpecificResourceReturnsACollectionOfThatResource($pa
      */
     public function testGettingTheCountOfACollectionReturnsThatCollectionsCount($path, $fnName, $class)
     {
-        if (in_array($path, array('coupons', 'orderstatuses', 'products/skus', 'requestlogs'))) {
+        if (in_array($path, array('coupons', 'order_statuses', 'products/skus', 'requestlogs'))) {
             $this->markTestSkipped(sprintf('Getting the count The php client does not support getting the count of %s', $path));
         }
 
@@ -561,4 +561,15 @@ public function testGettingASpecifiedCouponReturnsThatCoupon()
         $resource = Client::getCoupon(1);
         $this->assertInstanceOf('Bigcommerce\\Api\\Resources\\Coupon', $resource);
     }
+
+    public function testGettingASpecifiedOrderStatusReturnsThatOrderStatus()
+    {
+        $this->connection->expects($this->once())
+            ->method('get')
+            ->with('/order_statuses/1', false)
+            ->will($this->returnValue(array(array(), array())));
+
+        $resource = Client::getOrderStatus(1);
+        $this->assertInstanceOf('Bigcommerce\\Api\\Resources\\OrderStatus', $resource);
+    }
 }

From 0bdd1431394217416e5375144dc58c3195a97b2c Mon Sep 17 00:00:00 2001
From: bc-joshroe <joshua.roe@bigcommerce.com>
Date: Wed, 4 Mar 2015 13:13:56 -0800
Subject: [PATCH 2/2] Fixing a test error message

---
 test/Unit/Api/ClientTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Unit/Api/ClientTest.php b/test/Unit/Api/ClientTest.php
index 0000e6bc..fb9f04a8 100644
--- a/test/Unit/Api/ClientTest.php
+++ b/test/Unit/Api/ClientTest.php
@@ -275,7 +275,7 @@ public function testGettingASpecificResourceReturnsACollectionOfThatResource($pa
     public function testGettingTheCountOfACollectionReturnsThatCollectionsCount($path, $fnName, $class)
     {
         if (in_array($path, array('coupons', 'order_statuses', 'products/skus', 'requestlogs'))) {
-            $this->markTestSkipped(sprintf('Getting the count The php client does not support getting the count of %s', $path));
+            $this->markTestSkipped(sprintf('The PHP client does not support getting the count of %s', $path));
         }
 
         $this->connection->expects($this->once())