Skip to content

Commit 4450619

Browse files
committed
MC-21491: Pricing :: FPT display settings
- fix tests
1 parent e99713e commit 4450619

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class ProductViewTest extends GraphQlAbstract
4141
/** @var string */
4242
private $defaultRegionSystemSetting;
4343

44-
4544
/** @var string */
4645
private $defaultPriceDisplayType;
4746

dev/tests/api-functional/testsuite/Magento/GraphQl/Weee/StoreConfigFPTTest.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function sameFPTDisplaySettingsProvider()
8181
Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_INCL,
8282
Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_INCL,
8383
],
84-
'displayValue' => 'INCLUDING_FPT',
84+
'displayValue' => 'INCLUDE_FPT_WITHOUT_DETAILS',
8585
],
8686
[
8787
'weeTaxSettingsDisplayIncludedAndDescription' => [
@@ -90,7 +90,7 @@ public function sameFPTDisplaySettingsProvider()
9090
Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_INCL_DESCR,
9191
Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_INCL_DESCR,
9292
],
93-
'displayValue' => 'INCLUDING_FPT_AND_FPT_DESCRIPTION',
93+
'displayValue' => 'INCLUDE_FPT_WITH_DETAILS',
9494
],
9595
[
9696
'weeTaxSettingsDisplayIncludedAndExcludedAndDescription' => [
@@ -99,7 +99,7 @@ public function sameFPTDisplaySettingsProvider()
9999
Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL,
100100
Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL,
101101
],
102-
'displayValue' => 'EXCLUDING_FPT_INCLUDING_FPT_AND_FPT_DESCRIPTION',
102+
'displayValue' => 'EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS',
103103
],
104104
[
105105
'weeTaxSettingsDisplayExcluded' => [
@@ -108,7 +108,7 @@ public function sameFPTDisplaySettingsProvider()
108108
Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_EXCL,
109109
Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_EXCL,
110110
],
111-
'displayValue' => 'EXCLUDING_FPT',
111+
'displayValue' => 'EXCLUDE_FPT_WITHOUT_DETAILS',
112112
],
113113
[
114114
'weeTaxSettingsDisplayExcluded' => [
@@ -117,7 +117,7 @@ public function sameFPTDisplaySettingsProvider()
117117
Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_EXCL,
118118
Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_EXCL,
119119
],
120-
'displayValue' => 'NONE',
120+
'displayValue' => 'FPT_DISABLED',
121121
],
122122
];
123123
}
@@ -151,13 +151,16 @@ public function testDifferentFPTDisplaySettings(array $weeTaxSettings)
151151
$this->assertNotEmpty($result['storeConfig']['category_fixed_product_tax_display_setting']);
152152
$this->assertNotEmpty($result['storeConfig']['sales_fixed_product_tax_display_setting']);
153153

154-
$this->assertEquals('INCLUDING_FPT', $result['storeConfig']['product_fixed_product_tax_display_setting']);
155154
$this->assertEquals(
156-
'INCLUDING_FPT_AND_FPT_DESCRIPTION',
155+
'INCLUDE_FPT_WITHOUT_DETAILS',
156+
$result['storeConfig']['product_fixed_product_tax_display_setting']
157+
);
158+
$this->assertEquals(
159+
'INCLUDE_FPT_WITH_DETAILS',
157160
$result['storeConfig']['category_fixed_product_tax_display_setting']
158161
);
159162
$this->assertEquals(
160-
'EXCLUDING_FPT_INCLUDING_FPT_AND_FPT_DESCRIPTION',
163+
'EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS',
161164
$result['storeConfig']['sales_fixed_product_tax_display_setting']
162165
);
163166
}

0 commit comments

Comments
 (0)