From 8b529885df2239e1345301a69f72df43bbcc8f84 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@ebay.com>
Date: Mon, 26 Oct 2015 15:22:48 +0200
Subject: [PATCH] MAGETWO-44589: [Github] Make API jsonapi compliant
---
.../Magento/Bundle/Api/CartItemRepositoryTest.php | 4 ++--
.../Magento/Catalog/Api/CartItemRepositoryTest.php | 3 +--
.../Api/CartItemRepositoryTest.php | 11 +++++------
.../Downloadable/Api/CartItemRepositoryTest.php | 13 ++++++-------
4 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/dev/tests/api-functional/testsuite/Magento/Bundle/Api/CartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/CartItemRepositoryTest.php
index 9cb6aebe809..8442c0cfc8b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Bundle/Api/CartItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/CartItemRepositoryTest.php
@@ -94,7 +94,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'items',
+ 'resourcePath' => self::RESOURCE_PATH . $cartId . '/items',
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
],
'soap' => [
@@ -161,7 +161,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'items/' . $itemId,
+ 'resourcePath' => self::RESOURCE_PATH . $cartId . '/items/' . $itemId,
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
],
'soap' => [
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CartItemRepositoryTest.php
index dbd5c8b3d2e..27a0c4b3155 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CartItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CartItemRepositoryTest.php
@@ -13,7 +13,6 @@ class CartItemRepositoryTest extends WebapiAbstract
{
const SERVICE_NAME = 'quoteCartItemRepositoryV1';
const SERVICE_VERSION = 'V1';
- const RESOURCE_PATH = '/V1/carts/items';
const SIMPLE_PRODUCT_SKU = 'simple';
/**
@@ -43,7 +42,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH,
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items',
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
],
'soap' => [
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/CartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/CartItemRepositoryTest.php
index 07e00fa1a0b..f2b73461e04 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/CartItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/CartItemRepositoryTest.php
@@ -12,7 +12,6 @@ class CartItemRepositoryTest extends WebapiAbstract
{
const SERVICE_NAME = 'quoteCartItemRepositoryV1';
const SERVICE_VERSION = 'V1';
- const RESOURCE_PATH = '/V1/carts/items';
const CONFIGURABLE_PRODUCT_SKU = 'configurable';
/**
@@ -38,7 +37,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH,
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items',
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
],
'soap' => [
@@ -83,7 +82,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH,
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items',
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
],
'soap' => [
@@ -122,7 +121,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/1000',
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items/1000',
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT
],
'soap' => [
@@ -171,7 +170,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/' . $item->getId(),
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items/' . $item->getId(),
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT
],
'soap' => [
@@ -248,7 +247,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/' . $item->getId(),
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items/' . $item->getId(),
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT
],
'soap' => [
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/CartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/CartItemRepositoryTest.php
index 9e3512653a7..bc6cc445e62 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/CartItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/CartItemRepositoryTest.php
@@ -11,7 +11,6 @@ class CartItemRepositoryTest extends WebapiAbstract
{
const SERVICE_VERSION = 'V1';
const SERVICE_NAME = 'quoteCartItemRepositoryV1';
- const RESOURCE_PATH = '/V1/carts/';
/**
* @var \Magento\TestFramework\ObjectManager
@@ -38,7 +37,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$cartId = $quote->getId();
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'items',
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items',
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
],
'soap' => [
@@ -95,7 +94,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$productSku = $product->getSku();
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'items',
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items',
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
],
'soap' => [
@@ -139,7 +138,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$itemId = $quote->getAllItems()[0]->getId();
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'items/' . $itemId,
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items/' . $itemId,
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
],
'soap' => [
@@ -202,7 +201,7 @@ class CartItemRepositoryTest extends WebapiAbstract
'operation' => self::SERVICE_NAME . 'Save',
],
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'items/' . $itemId,
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items/' . $itemId,
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
],
];
@@ -262,7 +261,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . $cartId . '/items',
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items',
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
],
'soap' => [
@@ -291,7 +290,7 @@ class CartItemRepositoryTest extends WebapiAbstract
$itemId = $quote->getAllItems()[0]->getId();
$serviceInfo = [
'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . 'items/' . $itemId,
+ 'resourcePath' => '/V1/carts/' . $cartId . '/items/' . $itemId,
'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
],
'soap' => [
--
GitLab