diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
index 6dae249865157d1c5960c8be6cefa9bdf27b3126..43114cb83ad149ff07a2310ec1924dcd6f9faa25 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
@@ -84,6 +84,11 @@ class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product
$productIds = $collection->getAllIds();
$storeId = (int) $this->getRequest()->getParam('store', 0);
$status = (int) $this->getRequest()->getParam('status');
+ $filters = (array)$this->getRequest()->getParam('filters', []);
+
+ if (isset($filters['store_id'])) {
+ $storeId = (int)$filters['store_id'];
+ }
try {
$this->_validateMassStatus($productIds, $status);
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
index 0fff613c56e2e4edc5a6765826730ffefac89f10..6f7809d89e5bda52429f5c365f1fdd8519996189 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
@@ -6,32 +6,74 @@
*/
namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product;
+use Magento\Ui\Component\MassAction\Filter;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
+use Magento\Catalog\Controller\Adminhtml\Product\Builder;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Catalog\Model\Product\Action;
+
+/**
+ * Class MassStatusTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class MassStatusTest extends \Magento\Catalog\Test\Unit\Controller\Adminhtml\ProductTest
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Processor|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $priceProcessor;
+ private $priceProcessorMock;
- /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\View\Result\Redirect */
- protected $resultRedirect;
+ /**
+ * @var Redirect|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $resultRedirectMock;
+
+ /**
+ * @var Filter|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $filterMock;
+
+ /**
+ * @var Builder|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $productBuilderMock;
+
+ /**
+ * @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $abstractDbMock;
+
+ /**
+ * @var Action|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $actionMock;
protected function setUp()
{
- $this->priceProcessor = $this->getMockBuilder(\Magento\Catalog\Model\Indexer\Product\Price\Processor::class)
+ $this->priceProcessorMock = $this->getMockBuilder(Processor::class)
->disableOriginalConstructor()->getMock();
+ $this->productBuilderMock = $this->getMockBuilder(Builder::class)
+ ->setMethods(['build'])
+ ->disableOriginalConstructor()
+ ->getMock();
- $productBuilder = $this->getMockBuilder(
- \Magento\Catalog\Controller\Adminhtml\Product\Builder::class
- )->setMethods(['build'])->disableOriginalConstructor()->getMock();
-
- $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)->disableOriginalConstructor()
- ->setMethods(['getTypeId', 'getStoreId', '__sleep', '__wakeup'])->getMock();
- $product->expects($this->any())->method('getTypeId')->will($this->returnValue('simple'));
- $product->expects($this->any())->method('getStoreId')->will($this->returnValue('1'));
- $productBuilder->expects($this->any())->method('build')->will($this->returnValue($product));
+ $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getTypeId', 'getStoreId', '__sleep', '__wakeup'])
+ ->getMock();
+ $productMock->expects($this->any())
+ ->method('getTypeId')
+ ->willReturn('simple');
+ $productMock->expects($this->any())
+ ->method('getStoreId')
+ ->willReturn('1');
+ $this->productBuilderMock->expects($this->any())
+ ->method('build')
+ ->willReturn($productMock);
- $this->resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
+ $this->resultRedirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
->disableOriginalConstructor()
->getMock();
$resultFactory = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
@@ -41,47 +83,71 @@ class MassStatusTest extends \Magento\Catalog\Test\Unit\Controller\Adminhtml\Pro
$resultFactory->expects($this->atLeastOnce())
->method('create')
->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
- ->willReturn($this->resultRedirect);
+ ->willReturn($this->resultRedirectMock);
- $abstractDbMock = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
+ $this->abstractDbMock = $this->getMockBuilder(AbstractDb::class)
->disableOriginalConstructor()
->setMethods(['getAllIds', 'getResource'])
->getMock();
- $abstractDbMock->expects($this->any())
- ->method('getAllIds')
- ->willReturn([]);
-
- $filterMock = $this->getMockBuilder(\Magento\Ui\Component\MassAction\Filter::class)
+ $this->filterMock = $this->getMockBuilder(\Magento\Ui\Component\MassAction\Filter::class)
->disableOriginalConstructor()
->setMethods(['getCollection'])
->getMock();
- $filterMock->expects($this->any())
- ->method('getCollection')
- ->willReturn($abstractDbMock);
-
- $collectionFactoryMock = $this->getMockBuilder(
- \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class
- )
+ $this->actionMock = $this->getMockBuilder(Action::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $collectionFactoryMock =
+ $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class)
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
$collectionFactoryMock->expects($this->any())
->method('create')
- ->willReturn($abstractDbMock);
+ ->willReturn($this->abstractDbMock);
+
+ $additionalParams = [
+ 'resultFactory' => $resultFactory
+ ];
+ /** @var \Magento\Backend\App\Action\Context $context */
+ $context = $this->initContext($additionalParams, [[Action::class, $this->actionMock]]);
- $additionalParams = ['resultFactory' => $resultFactory];
$this->action = new \Magento\Catalog\Controller\Adminhtml\Product\MassStatus(
- $this->initContext($additionalParams),
- $productBuilder,
- $this->priceProcessor,
- $filterMock,
+ $context,
+ $this->productBuilderMock,
+ $this->priceProcessorMock,
+ $this->filterMock,
$collectionFactoryMock
);
}
public function testMassStatusAction()
{
- $this->priceProcessor->expects($this->once())->method('reindexList');
+ $storeId = 1;
+ $status = \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED;
+ $filters = [
+ 'store_id' => 2,
+ ];
+
+ $this->filterMock->expects($this->once())
+ ->method('getCollection')
+ ->willReturn($this->abstractDbMock);
+ $this->abstractDbMock->expects($this->once())
+ ->method('getAllIds')
+ ->willReturn([3]);
+ $this->request->expects($this->exactly(3))
+ ->method('getParam')
+ ->willReturnMap([
+ ['store', 0, $storeId],
+ ['status', null, $status],
+ ['filters', [], $filters]
+ ]);
+ $this->actionMock->expects($this->once())
+ ->method('updateAttributes')
+ ->with([3], ['status' => $status], 2);
+ $this->priceProcessorMock->expects($this->once())
+ ->method('reindexList');
+
$this->action->execute();
}
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
index 9a21de70b4f114fceb5950ea716c580068584669..524bdceae10e03cfc9678f10d19b881588ff8de8 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Catalog\Test\Unit\Controller\Adminhtml;
+use Magento\Catalog\Api\Data\ProductInterface;
+
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -25,17 +27,33 @@ abstract class ProductTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
protected $request;
+ /**
+ * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $objectManagerMock;
+
/**
* Init context object
*
* @param array $additionalParams
+ * @param array $objectManagerMap Object Manager mappings
* @return \PHPUnit_Framework_MockObject_MockObject
*/
- protected function initContext(array $additionalParams = [])
+ protected function initContext(array $additionalParams = [], array $objectManagerMap = [])
{
$productActionMock = $this->getMock(\Magento\Catalog\Model\Product\Action::class, [], [], '', false);
- $objectManagerMock = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
- $objectManagerMock->expects($this->any())->method('get')->will($this->returnValue($productActionMock));
+
+ $this->objectManagerMock = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
+
+ if ($objectManagerMap) {
+ $this->objectManagerMock->expects($this->any())
+ ->method('get')
+ ->willReturnMap($objectManagerMap);
+ }
+
+ $this->objectManagerMock->expects($this->any())
+ ->method('get')
+ ->willReturn($productActionMock);
$block = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
->disableOriginalConstructor()->getMockForAbstractClass();
@@ -93,7 +111,7 @@ abstract class ProductTest extends \PHPUnit_Framework_TestCase
$this->context->expects($this->any())->method('getEventManager')->will($this->returnValue($eventManager));
$this->context->expects($this->any())->method('getRequest')->will($this->returnValue($requestInterfaceMock));
$this->context->expects($this->any())->method('getResponse')->will($this->returnValue($responseInterfaceMock));
- $this->context->expects($this->any())->method('getObjectManager')->will($this->returnValue($objectManagerMock));
+ $this->context->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
$this->context->expects($this->any())->method('getMessageManager')
->will($this->returnValue($managerInterfaceMock));
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js b/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
index d87b6b6b665ca0d070287474edb41eb5ced41c33..dca12f832cd15e1cdc197ec909df92557c45da60 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
@@ -79,6 +79,10 @@ define([
getData: function (params, options) {
var cachedRequest = this.getRequest(params);
+ if (params && params.filters && params.filters['store_id']) {
+ cachedRequest = false;
+ }
+
options = options || {};
return !options.refresh && cachedRequest ?
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
index c949d827b4879599685bca266e12edfd2eb3a384..d4cf5dab742aa37684e8b5ee884bd6164c88426f 100644
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
@@ -6,12 +6,12 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
- <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="One page check out with Authorize.Net payment method.">
- <variation name="OnePageCheckoutAuthorizenetTestVariation1" summary="Check Out as a Guest with Authorize.Net and Offline Shipping method" ticketId="MAGETWO-12832">
+ <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="One page check out with Authorize.Net Direct Post payment method.">
+ <variation name="OnePageCheckoutAuthorizenetTestVariation1" summary="CheckOut with Authorize.Net Direct Post" ticketId="MAGETWO-59170">
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="customer/dataset" xsi:type="string">default</data>
- <data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
- <data name="checkoutMethod" xsi:type="string">guest</data>
+ <data name="checkoutMethod" xsi:type="string">login</data>
+ <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
<data name="prices" xsi:type="array">
@@ -26,7 +26,7 @@
<item name="isClosed" xsi:type="string">No</item>
<item name="transactionType" xsi:type="string">Authorization</item>
</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
index 6601bd44892c93e30573c5342e483eb232573e70..dda155f7fd66bd33a5532ab4a36c937a1d10178b 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php
@@ -38,6 +38,7 @@ class BraintreeSettlementReportTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml
index 183dc6ac906074fb6dc918e765d648ea437fd05b..e80f6071ae5d1d33b37bb7c26c7389ed08aa8962 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml
@@ -22,7 +22,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
<data name="configData" xsi:type="string">braintree</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
index a0bf482705f552318a7cdd09951aaff14eaf1cb2..c9d0904c85d675d7a4aa360ac6a2f8c00c6b0862 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
@@ -33,6 +33,7 @@ class CheckoutWithBraintreePaypalCartTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml
index 09b33bfa79958668ceef14a20e48cf0ecce2646e..9e1090d6a22f91102be14f0f4319921651f01841 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml
@@ -20,7 +20,7 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -42,7 +42,7 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
index f0f0291b33e20428765c110dbb23600ba463bdde..9ee6bfb7c4e29b84043fd3b116a09153bfab4233 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
@@ -33,6 +33,7 @@ class CheckoutWithBraintreePaypalMinicartTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
index b426e7578729dd3b0ba514440b7b425b373ae20b..b41ea91e4598255a67e3e44180895873358a9b1a 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
@@ -20,7 +20,7 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -42,7 +42,7 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
index 6554845d5ff81af96b887a9dbcb8e05761b21463..9e6cf0991db4e5fb2c3dd2c45de7d365e67395f6 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
@@ -25,6 +25,7 @@ class CreateOnlineCreditMemoBraintreePaypalTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
index 56c33af7a82b986b23372c9cbf0f2e8e915876a3..53847e55fd9f91e29fbeeb6c71a0402a1fb6a6f6 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
@@ -22,9 +22,8 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
<data name="paymentAction" xsi:type="string">sale</data>
- <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship, Reorder</data>
<data name="data/items_data/0/qty" xsi:type="string">-</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
@@ -42,12 +41,11 @@
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
- <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship, Reorder</data>
<data name="data/items_data/0/qty" xsi:type="string">2</data>
<data name="refundData/items_data/0/qty" xsi:type="string">1</data>
<data name="order/dataset" xsi:type="string">default</data>
<data name="isCreditMemoPartial" xsi:type="string">Yes</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml
index 702a732e937eabedff8f6525e651fe4c16de942c..d9f382e4b650e5ce48955e264c67b36c893dbb84 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml
@@ -29,7 +29,7 @@
<data name="data/items_data/0/qty" xsi:type="string">-</data>
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
<constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
@@ -58,7 +58,7 @@
<data name="data/items_data/0/qty" xsi:type="string">1</data>
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
<constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
index 80596fb577b970d41e01e8e98d26c86a28262b70..9614923691c6c097702c3a222bfc52edfcd2489a 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Sales\Test\TestCase\CreateOrderBackendTest" summary="Checkout with Braintree Credit Card from Admin">
<variation name="CreateOrderBackendTestBraintreeVariation1" summary="Checkout with Braintree Credit Card from Admin (Payment Action = Authorize Only)" ticketId="MAGETWO-46294">
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
<data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
@@ -32,11 +32,10 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
- <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
</variation>
<variation name="CreateOrderBackendTestBraintreeVariation2" summary="Checkout with Braintree Credit Card from Admin (Payment Action = Authorize and Capture)" ticketId="MAGETWO-38316">
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test, severity:S0</data>
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
<data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
@@ -63,7 +62,6 @@
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
- <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
</variation>
</testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml
index 4f05723609c2a8305f68a6893787684ae2e3d9df..db6cd3572eaa2acec5ded94997b1951c744e6652 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Vault\Test\TestCase\CreateVaultOrderBackendTest" summary="Create Order from Admin via Braintree with saving Credit Cards">
<variation name="CreateVaultOrderBackendTestBraintreeVariation1" summary="Checkout with Braintree Credit Card from Admin (Payment Action = Authorize Only)" ticketId="MAGETWO-47137, MAGETWO-47139">
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
index 7048984886582f7e74ffaa6d5d0597ee4ae5b018..062de338d8921e15b786de0fd4b656e824354d80 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
@@ -29,6 +29,7 @@ class InvoicePayPalBraintreeTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
index bae626a427818b115d897d06dd33b4a894da1cba..352e0ed684919a43df66b429d5b8250d90cae351 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
@@ -26,7 +26,7 @@
<data name="data/items_data/0/qty" xsi:type="string">-</data>
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceItems" />
@@ -51,7 +51,7 @@
<data name="data/items_data/0/qty" xsi:type="string">1</data>
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceItems" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php
index 41f637d52941d463223e1706e1175939e8c817ee..68d36f3c754cf6ff5bca786cb314fd89e51f9c5d 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php
@@ -8,17 +8,25 @@ namespace Magento\Braintree\Test\TestCase;
use Magento\Mtf\TestCase\Scenario;
/**
- * Class OnePageCheckoutAcceptPaymentTest
+ * Preconditions:
+ * 1. Order is placed with Braintree Credit Card from Storefront with Advanced Fraud Protection.
*
- * This scenario places order via Braintree payment with
- * enabled Advanced Fraud protection and accept payment for placed order
- * to future processing
+ * Steps:
+ * 1. Log in to Admin.
+ * 2. Go to Sales > Orders page.
+ * 3. Open the placed order.
+ * 4. Click Accept button.
+ * 5. Perform assertions.
+ *
+ * @group Braintree
+ * @ZephyrId MAGETWO-56023
*/
class OnePageCheckoutAcceptPaymentTest extends Scenario
{
/* tags */
const MVP = 'yes';
const TEST_TYPE = 'acceptance_test, 3rd_party_test';
+ const SEVERITY = 'S2';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml
index f42054b4a07325512db19b497627d0099dbc7a3a..841145d7a5fdfaa92f1a82ac00c9bf51f0601643 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml
@@ -21,7 +21,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
<data name="configData" xsi:type="string">braintree,braintree_fraudprotection</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
<constraint name="Magento\Sales\Test\Constraint\AssertAcceptPaymentSuccessMessagePresent" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertAcceptPaymentMessageInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php
index 69fd4a8323eca15728d9c6f5b65c91a4929dc562..143ecb5a65d7d4a6af6a9b00d4b15175230cd0f4 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php
@@ -8,16 +8,25 @@ namespace Magento\Braintree\Test\TestCase;
use Magento\Mtf\TestCase\Scenario;
/**
- * Class OnePageCheckoutDenyPaymentTest
+ * Preconditions:
+ * 1. Order is placed with Braintree Credit Card from Storefront with Advanced Fraud Protection.
*
- * This scenario places order via Braintree payment with
- * enabled Advanced Fraud protection and deny payment for placed order
+ * Steps:
+ * 1. Log in to Admin.
+ * 2. Go to Sales > Orders page.
+ * 3. Open the placed order.
+ * 4. Click Deny button.
+ * 5. Perform assertions.
+ *
+ * @group Braintree
+ * @ZephyrId MAGETWO-56024
*/
class OnePageCheckoutDenyPaymentTest extends Scenario
{
/* tags */
const MVP = 'yes';
const TEST_TYPE = 'acceptance_test, 3rd_party_test';
+ const SEVERITY = 'S2';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml
index 45476abfdfd12c18dc8a7b36782bc0b8f30ed3c0..95d07079ef36c9ae66672ec8cc465325273ecda4 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml
@@ -21,7 +21,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
<data name="configData" xsi:type="string">braintree,braintree_fraudprotection</data>
<data name="status" xsi:type="string">Canceled</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
<constraint name="Magento\Sales\Test\Constraint\AssertDenyPaymentSuccessMessagePresent" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertDenyPaymentMessageInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
index a1ceaa53da045345a1e4a7a5a51089a5623a85b8..1e9c539c8c0d379d6e5b69929e9270b21a8cc593 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutTest.xml
@@ -25,7 +25,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
<data name="configData" xsi:type="string">braintree, braintree_3d_secure_not_triggered_due_threshold</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -48,7 +48,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure</data>
<data name="configData" xsi:type="string">braintree, braintree_3d_secure_uk</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -71,13 +71,13 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
<data name="configData" xsi:type="string">braintree</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:extended_acceptance_test, test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
</variation>
- <variation name="OnePageCheckoutBraintreeTestVariation4" summary="Checkout with Braintree for payment action Authorize and Capture" ticketId="MAGETWO-38420">
+ <variation name="OnePageCheckoutBraintreeTestVariation4" summary="Checkout with Braintree for payment action Authorize and Capture" ticketId="MAGETWO-59403">
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
<data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
@@ -98,7 +98,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
<data name="configData" xsi:type="string">braintree, braintree_sale</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
index 32599aa090651c76f7d9d2663309ea3a219f79f6..e4b7d82094db5a615b3df3000f18fbd9a1f41b6d 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
@@ -39,6 +39,7 @@ class OnePageCheckoutWith3dSecureTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.xml
index 4cb5b1702dd3baac27c41b3c7367456299e8ef8e..295a9dcd5c5332dce7d6e5fad9dfcdc6f5352596 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.xml
@@ -31,7 +31,7 @@
<data name="secure3d/dataset" xsi:type="string">secure3d_braintree</data>
<data name="configData" xsi:type="string">braintree, braintree_3d_secure</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
index 9cf0e9c90c1215649e50e0a708bcae5db371d9fd..a984f666c435680c68b97d0481b8b86a3f487b0e 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
@@ -37,6 +37,7 @@ class OnePageCheckoutWithBraintreePaypalTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
index 8f2177209f37b7f83d2b5ad97e2599ed7f7ff67c..7e38e6f0303b64e55ce6e126a2653f0ce7420df7 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
@@ -21,7 +21,7 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -44,7 +44,7 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithDiscountTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithDiscountTest.xml
index 89d67936ab0c610cd67054d428c39cd8da341b53..23fc729edb99f9645f7587d8e350464c81083fcd 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithDiscountTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithDiscountTest.xml
@@ -25,12 +25,10 @@
<data name="creditCardSave" xsi:type="string">Yes</data>
<data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
- <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
- <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
</variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
index 88ab2ef65c9a0e75d2eafff8c53fe898d9504efe..5a99c4a89a313392cdd596891712b1d2d4bbaec3 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/ReorderUsingVaultTest.xml
@@ -23,7 +23,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
<data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
index f6813b74e40d7b09edf48369f6dc79ca28fefa7d..8845f2a78629da6d2c3994b1e691cce117efa8bc 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
@@ -43,6 +43,7 @@ class SaveUseDeleteVaultForPaypalBraintreeTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.xml
index 6e214d4c205aacc72fa8b93cbd4c082d2d02fa96..c7a5182a1dfb3d693dc03eb5c77d9d2c26622a58 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.xml
@@ -23,7 +23,7 @@
<data name="creditCardSave" xsi:type="string">Yes</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_use_vault</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Vault\Test\Constraint\AssertStoredPaymentDeletedMessage" />
</variation>
</testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml
index 00eb9c4802db6216bd1dbc0202231612166b306c..35d55784b676236d808cf0f54fc969fc65193b0b 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml
@@ -22,7 +22,7 @@
<data name="creditCardSave" xsi:type="string">Yes</data>
<data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
index 13b8240d4c49ebe4b047e59f6bfdb63102fbcf47..d2723a300285df0b560ece526e463b495f201d8f 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
@@ -43,6 +43,7 @@ class UseVaultWith3dSecureOnCheckoutTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.xml
index 0f00ff93612b8b1ef7792971b38846efbe3d2b43..a5aa7645148e158ad62a174bc26d08abfd037192 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.xml
@@ -27,7 +27,7 @@
<data name="creditCardSave" xsi:type="string">Yes</data>
<data name="configData" xsi:type="string">braintree, braintree_use_vault, braintree_3d_secure</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml
index be2d771e47f5bfaf9c93ac9ac909d87ef723bff1..7bdfca2f713f20a9f41b4c19d9bb1e36f55a59c1 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml
@@ -8,12 +8,12 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<type name="Magento\Braintree\Test\Constraint\Assert3dSecureInfoIsPresent">
<arguments>
- <argument name="severity" xsi:type="string">high</argument>
+ <argument name="severity" xsi:type="string">S1</argument>
</arguments>
</type>
<type name="Magento\Braintree\Test\Constraint\AssertTransactionIsPresentInSettlementReport">
<arguments>
- <argument name="severity" xsi:type="string">high</argument>
+ <argument name="severity" xsi:type="string">S1</argument>
</arguments>
</type>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml
index 7d4a961b7686733323d2683ef335c72223f6b460..9bec14fd9575d945218bffd258cde0d06b766d92 100644
--- a/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml
@@ -20,7 +20,7 @@
<data name="cart/data/shipping_method" xsi:type="string">Express easy</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, dhl_eu, shipping_origin_CH, config_base_currency_ch</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml
index 9d6b7d119e09ce6f65529c028b24e190d0f8d42f..fcf8331d18ba7fd02427602013b1674aadfb11fd 100644
--- a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml
@@ -20,7 +20,7 @@
<data name="cart/data/shipping_method" xsi:type="string">International Economy</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -39,7 +39,7 @@
<data name="cart/data/shipping_method" xsi:type="string">Ground</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php
index b1c2d71a43bdd7d77cabb00d010261245b599d00..37d85bd91b1d68ddea5ae0c1fd250547810d6d19 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php
@@ -16,6 +16,7 @@ class ConflictResolutionTest extends Scenario
/* tags */
const MVP = 'no';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S2';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml
index dc2ba760025fb71427e2ea50a7e3cce4e1c305e5..163c33f7306bac0f8d859ea9cddbf98e6e2eb2a3 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml
@@ -40,7 +40,7 @@
<item name="Authorize.net Direct Post" xsi:type="string"/>
</item>
</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
</variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/etc/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fc6a35a7c52c1b91792252cf08d13ff20d50a88f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/etc/di.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+ <type name="Magento\Payment\Test\Constraint\AssertCardRequiredFields">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Payment\Test\Constraint\AssertFieldsAreActive">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Payment\Test\Constraint\AssertFieldsAreDisabled">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Payment\Test\Constraint\AssertFieldsAreEnabled">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Payment\Test\Constraint\AssertFieldsArePresent">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php
index d4ec11acd51bf53c38de3be6e927b8a24037c1d8..3e510ab12ec3219a10ccabf6d20c0e2e8e70e0ba 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php
@@ -35,6 +35,7 @@ class CreatePayFlowOrderBackendNegativeTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S2';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.xml
index 04b34813e59ceacd332657d66366d2789f469e71..4ad751de68a71f0330aa547bf74481c3e306f379 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Paypal\Test\TestCase\CreatePayFlowOrderBackendNegativeTest" summary="Verify required fields validation for PayPal Payflow Pro credit card on admin order creation" ticketId="MAGETWO-58934">
<variation name="CreatePayFlowOrderBackendNegativeTestPayflowProVariation1" summary="Verify required fields validation for credit card on admin order creation" ticketId="MAGETWO-58934">
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateVaultOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateVaultOrderBackendTest.xml
index 64a191040b8a451aede65fe73dc9785747509c4f..38666c36a2ba4e53641f45616060353ca5e5e22c 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateVaultOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateVaultOrderBackendTest.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\Vault\Test\TestCase\CreateVaultOrderBackendTest" summary="Use saved for PayPal Payflow Pro credit card on admin order creation" ticketId="MAGETWO-47350">
<variation name="CreateVaultOrderBackendTestPayflowProVariation1" summary="Use saved for PayPal Payflow Pro credit card on admin order creation" ticketId="MAGETWO-47350">
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="customer/dataset" xsi:type="string">default</data>
<data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
index c8fb3e4f30f19834d1587cf1a1290aeeace7b958..8a10d08e0f6c3e6cdfddc7ec1a52d8796d54fca3 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
@@ -31,6 +31,7 @@ class ExpressCheckoutFromProductPageTest extends Scenario
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml
index 4373523471cffc5e8e13b6bc01dffc9902516cd0..1d92fa149efbc336eb0910a451a1740f2eda6c14 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml
@@ -27,7 +27,7 @@
</data>
<data name="payment/method" xsi:type="string">paypal_express</data>
<data name="configData" xsi:type="string">paypal_express, freeshipping</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
index 7fc35ff1eb6fd83e929886bcdeac741de868fe68..6ecf356e27ff8c61a04329cb3211f0f6e1e9c05f 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
@@ -31,6 +31,7 @@ class ExpressCheckoutFromShoppingCartTest extends Scenario
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml
index e4a4cd484a45a3b0ed0d8e015d791c207563b96a..38c876719bc3d82c772ff6f86cd507229ec5cf2b 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml
@@ -28,7 +28,7 @@
<item name="grandTotal" xsi:type="string">145.98</item>
</data>
<data name="configData" xsi:type="string">payflowpro</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
index b40adf986dbe9a7311fec484411bb8a7ed50810d..5d7056d32703dbe6b79c6b099ab9a11fa2b9d41f 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.php
@@ -35,6 +35,7 @@ class ExpressCheckoutOnePageTest extends Scenario
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml
index df02c3293b50c5ed1bb2394bdeb6fc378f677874..e52ed631ae46f983dc8860e7bf628f95a5a6a7fb 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml
@@ -26,7 +26,7 @@
</data>
<data name="payment/method" xsi:type="string">paypal_express</data>
<data name="configData" xsi:type="string">paypal_express</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
@@ -51,7 +51,7 @@
</data>
<data name="payment/method" xsi:type="string">paypal_express</data>
<data name="configData" xsi:type="string">payflowlink</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
index 07f03b1c931cfc0c547f781451630fa828101294..66ca21d8d0f3eae424d9b3f926bf0003ff3dd9d6 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.php
@@ -32,6 +32,7 @@ class InContextExpressCheckoutFromShoppingCartTest extends Scenario
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml
index 979a8c2f32db3fd9333adbfe6fd8b52263edf462..bbc566d1e31ec620746316d2e3ebcfe76c6883ae 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressCheckoutFromShoppingCartTest.xml
@@ -10,7 +10,7 @@
<variation name="InContextExpressCheckoutFromShoppingCartTestVariation1" summary="In-Context Checkout with PayPal Express Checkout (API Credentials) from shopping cart " ticketId="MAGETWO-47213">
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="configData" xsi:type="string">paypal_express, paypal_express_in_context</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Paypal\Test\Constraint\AssertExpressCancelledMessage" />
</variation>
</testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
index ff06e6b10266ef4b723811bf143b648aa59853e9..b96f6a3e4a70a4ce320b0bf7b424675a0eee8fc4 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.php
@@ -32,6 +32,7 @@ class InContextExpressOnePageCheckoutTest extends Scenario
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
const TO_MAINTAIN = 'yes';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml
index cbdd9c3b6d6d31d13acac40ef5c8420b51054f85..5fa8e6e8b775dfb4e0bae646d431196823312f98 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/InContextExpressOnePageCheckoutTest.xml
@@ -18,7 +18,7 @@
</data>
<data name="payment/method" xsi:type="string">paypal_express</data>
<data name="configData" xsi:type="string">paypal_express_in_context, paypal_express, freeshipping</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Paypal\Test\Constraint\AssertExpressCancelledMessage" />
</variation>
</testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..379e90eb72c0d15c28b4de340f019ed21e9978c5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate through admin menu" ticketId="MAGETWO-34874">
+ <variation name="NavigateMenuTest50">
+ <data name="tag" xsi:type="string">severity:S0</data>
+ <data name="menuItem" xsi:type="string">Reports > PayPal Settlement</data>
+ <data name="pageTitle" xsi:type="string">PayPal Settlement Reports</data>
+ <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
+ </variation>
+ <variation name="NavigateMenuTest51">
+ <data name="tag" xsi:type="string">severity:S0</data>
+ <data name="menuItem" xsi:type="string">Sales > Billing Agreements</data>
+ <data name="pageTitle" xsi:type="string">Billing Agreements</data>
+ <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ReorderUsingVaultTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ReorderUsingVaultTest.xml
index bc3ee3cef1c68ba1668891cce3e6f2eb45a4d86d..c33abb1dbdd2263fded6dbbfb0f683848a3bdd3f 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ReorderUsingVaultTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ReorderUsingVaultTest.xml
@@ -23,7 +23,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_default</data>
<data name="configData" xsi:type="string">payflowpro, payflowpro_use_vault</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/UseVaultOnCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/UseVaultOnCheckoutTest.xml
index bde3837d71fda02bad93ac1ced7c3c08835deafe..92b4be03b5937ffa318f9d3cd05f6e6d2290f6bc 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/UseVaultOnCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/UseVaultOnCheckoutTest.xml
@@ -21,7 +21,7 @@
<data name="creditCardSave" xsi:type="string">Yes</data>
<data name="configData" xsi:type="string">payflowpro, payflowpro_use_vault</data>
<data name="status" xsi:type="string">Processing</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<data name="status" xsi:type="string">Processing</data>
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e56386d5e0eacc346bfb5ddaf84319a1d1d16313
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/di.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+ <type name="Magento\Paypal\Test\Constraint\Sandbox\AssertTotalPaypalReview">
+ <arguments>
+ <argument name="severity" xsi:type="string">S1</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Paypal\Test\Constraint\AssertExpressCancelledMessage">
+ <arguments>
+ <argument name="severity" xsi:type="string">S1</argument>
+ </arguments>
+ </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml
index b27bc81d2866045de5c9e1d18fa4689a09a360d1..45076e90aab202b1cae7fbc5abcefbfc6c11e317 100644
--- a/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml
@@ -20,7 +20,7 @@
<data name="cart/data/shipping_method" xsi:type="string">UPS Ground</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
@@ -39,7 +39,7 @@
<data name="cart/data/shipping_method" xsi:type="string">UPS Worldwide Expedited</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
index 28c2b0f16239c735c927a8d3f7ef8eb0ebc1b01b..0bd219bab3bfff2103ea9f7a1ff2934ca8e1ad59 100644
--- a/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
@@ -20,7 +20,7 @@
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
@@ -37,7 +37,7 @@
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail Express International Flat Rate Envelope</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
index 3c306280215ea1a2ee460db6f7838fd7c33caf7c..a5194b3915191e7c5ef893bcb5958d610544ddf7 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/CreateVaultOrderBackendTest.php
@@ -38,6 +38,7 @@ class CreateVaultOrderBackendTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = 'acceptance_test, extended_acceptance_test, 3rd_party_test';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
index 17db35df1b44e6d2be519426ba962f6696fee23d..e6462e4697aa612c1239b92b3c7b7e847bd252ba 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php
@@ -32,6 +32,7 @@ class DeleteSavedCreditCardTest extends Injectable
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S1';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
index ae303b695277c53272efedc40231bf305b66fea5..ac69bfb9f47e4550e6ab4592cccbdf56cf682da3 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.xml
@@ -52,7 +52,7 @@
</data>
<data name="creditCardSave" xsi:type="string">Yes</data>
<data name="configData" xsi:type="string">braintree, payflowpro, braintree_use_vault, payflowpro_use_vault</data>
- <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
</variation>
</testCase>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php
index c3b82af6949c4a0ea114324abae90aa7ccab3a24..e426662d30e5447599f0b2f4bc47b67902aeb7c9 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/ReorderUsingVaultTest.php
@@ -36,6 +36,8 @@ class ReorderUsingVaultTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = 'extended_acceptance_test, 3rd_party_test';
+ const SEVERITY = 'S1';
+
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
index 902ccc62af7f57c23db399bc22d5d3530b0a7515..fb8b3575ee72e463254038446ce55561123e3103 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/UseVaultOnCheckoutTest.php
@@ -39,6 +39,7 @@ class UseVaultOnCheckoutTest extends Scenario
/* tags */
const MVP = 'yes';
const TEST_TYPE = '3rd_party_test';
+ const SEVERITY = 'S0';
/* end tags */
/**
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aba54057312ea3491655b5ea6e75c9fef4dfc2ae
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/di.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+ <type name="Magento\Vault\Test\Constraint\AssertCreditCardNotPresentOnCheckout">
+ <arguments>
+ <argument name="severity" xsi:type="string">S2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Vault\Test\Constraint\AssertStoredPaymentDeletedMessage">
+ <arguments>
+ <argument name="severity" xsi:type="string">S1</argument>
+ </arguments>
+ </type>
+</config>
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
index 4b4ab839d3463cbef4c766161e41874d0d65e446..6836259eb671ac908ad017138bde36a86e764766 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
@@ -7,11 +7,6 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
- <rule scope="testcase">
- <deny>
- <tag group="test_type" value="3rd_party_test_deprecated" />
- </deny>
- </rule>
<rule scope="variation">
<deny>
<tag group="test_type" value="3rd_party_test" />