Skip to content

Commit e7eeead

Browse files
geronicageronica
authored
Adjusted fixtures (#236)
* adjusted fixtures * adjusted fixtures and adjusted tests for b2b-mp
1 parent 05ea482 commit e7eeead

File tree

8 files changed

+107
-6
lines changed

8 files changed

+107
-6
lines changed

‎cypress/e2e/mp/data-import/merchant-combined-product-offer.cy.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
} from '@interfaces/mp';
88
import { DataImportMerchantFilePage } from '@pages/mp';
99
import { CatalogPage, ProductPage } from '@pages/yves';
10+
import { CustomerLoginScenario } from '../../../support/scenarios/yves';
1011

1112
describe(
1213
'merchant combined product offer',
@@ -38,6 +39,7 @@ describe(
3839
const merchantUserLoginScenario = container.get(MerchantUserLoginScenario);
3940
const userLoginScenario = container.get(UserLoginScenario);
4041
const approveProductOfferScenario = container.get(ApproveProductOfferScenario);
42+
const customerLoginScenario = container.get(CustomerLoginScenario);
4143

4244
let dynamicFixtures: MerchantCombinedProductOfferDynamicFixtures;
4345
let staticFixtures: MerchantCombinedProductOfferStaticFixtures;
@@ -72,6 +74,12 @@ describe(
7274
productOfferReference,
7375
shouldTriggerPublishAndSync: true,
7476
});
77+
if (['b2b-mp'].includes(Cypress.env('repositoryId'))) {
78+
customerLoginScenario.execute({
79+
email: dynamicFixtures.customer.email,
80+
password: staticFixtures.defaultPassword,
81+
});
82+
}
7583
catalogPage.visit();
7684
catalogPage.searchProductFromSuggestions({ query: dynamicFixtures.product.sku });
7785
productPage.getProductOfferRadio({ productOfferReference }).should('exist');

‎cypress/e2e/mp/data-import/merchant-combined-product.cy.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { ActivateProductScenario, UserLoginScenario } from '@scenarios/backoffic
44
import { MerchantCombinedProductDynamicFixtures, MerchantCombinedProductStaticFixtures } from '@interfaces/mp';
55
import { CatalogPage, ProductPage } from '@pages/yves';
66
import { DataImportMerchantFilePage } from '@pages/mp';
7+
import { CustomerLoginScenario } from '../../../support/scenarios/yves';
78

89
describe(
910
'merchant combined product',
@@ -35,6 +36,7 @@ describe(
3536
const userLoginScenario = container.get(UserLoginScenario);
3637
const activateProductScenario = container.get(ActivateProductScenario);
3738
const productPage = container.get(ProductPage);
39+
const customerLoginScenario = container.get(CustomerLoginScenario);
3840

3941
let dynamicFixtures: MerchantCombinedProductDynamicFixtures;
4042
let staticFixtures: MerchantCombinedProductStaticFixtures;
@@ -66,7 +68,12 @@ describe(
6668
password: staticFixtures.defaultPassword,
6769
});
6870
activateProductScenario.execute({ abstractSku: abstractSku, shouldTriggerPublishAndSync: true });
69-
71+
if (['b2b-mp'].includes(Cypress.env('repositoryId'))) {
72+
customerLoginScenario.execute({
73+
email: dynamicFixtures.customer.email,
74+
password: staticFixtures.defaultPassword,
75+
});
76+
}
7077
catalogPage.visit();
7178
catalogPage.searchProductFromSuggestions({ query: abstractSku });
7279
cy.contains(abstractSku);

‎cypress/fixtures/b2b-mp/mp/data-import/dynamic-merchant-combined-product-offer.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,48 @@
8282
"type": "helper",
8383
"name": "addUserToGroup",
8484
"arguments": ["#rootUser.id_user", 1]
85+
},
86+
{
87+
"type": "helper",
88+
"name": "haveConfirmedCustomer",
89+
"key": "customer",
90+
"arguments": [{ "locale_name": "en_US", "password": "change123" }]
91+
},
92+
{
93+
"type": "helper",
94+
"name": "haveCompany",
95+
"key": "company",
96+
"arguments": [{ "isActive": true, "status": "approved" }]
97+
},
98+
{
99+
"type": "helper",
100+
"name": "haveCompanyBusinessUnit",
101+
"key": "businessUnit",
102+
"arguments": [{ "fkCompany": "#company.id_company" }]
103+
},
104+
{
105+
"type": "helper",
106+
"name": "havePermissionByKey",
107+
"key": "permission1",
108+
"arguments": ["AddCartItemPermissionPlugin"]
109+
},
110+
{
111+
"type": "helper",
112+
"name": "haveCompanyRoleWithPermissions",
113+
"arguments": [{ "isDefault": true, "fkCompany": "#company.id_company" }, ["#permission1"]]
114+
},
115+
{
116+
"type": "helper",
117+
"name": "haveCompanyUser",
118+
"key": "companyUser",
119+
"arguments": [
120+
{
121+
"customer": "#customer",
122+
"fkCustomer": "#customer.id_customer",
123+
"fkCompany": "#company.id_company",
124+
"fkCompanyBusinessUnit": "#businessUnit.id_company_business_unit"
125+
}
126+
]
85127
}
86128
]
87129
}

‎cypress/fixtures/b2b-mp/mp/data-import/dynamic-merchant-combined-product.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,48 @@
3030
"type": "helper",
3131
"name": "addUserToGroup",
3232
"arguments": ["#rootUser.id_user", 1]
33+
},
34+
{
35+
"type": "helper",
36+
"name": "haveConfirmedCustomer",
37+
"key": "customer",
38+
"arguments": [{ "locale_name": "en_US", "password": "change123" }]
39+
},
40+
{
41+
"type": "helper",
42+
"name": "haveCompany",
43+
"key": "company",
44+
"arguments": [{ "isActive": true, "status": "approved" }]
45+
},
46+
{
47+
"type": "helper",
48+
"name": "haveCompanyBusinessUnit",
49+
"key": "businessUnit",
50+
"arguments": [{ "fkCompany": "#company.id_company" }]
51+
},
52+
{
53+
"type": "helper",
54+
"name": "havePermissionByKey",
55+
"key": "permission1",
56+
"arguments": ["AddCartItemPermissionPlugin"]
57+
},
58+
{
59+
"type": "helper",
60+
"name": "haveCompanyRoleWithPermissions",
61+
"arguments": [{ "isDefault": true, "fkCompany": "#company.id_company" }, ["#permission1"]]
62+
},
63+
{
64+
"type": "helper",
65+
"name": "haveCompanyUser",
66+
"key": "companyUser",
67+
"arguments": [
68+
{
69+
"customer": "#customer",
70+
"fkCustomer": "#customer.id_customer",
71+
"fkCompany": "#company.id_company",
72+
"fkCompanyBusinessUnit": "#businessUnit.id_company_business_unit"
73+
}
74+
]
3375
}
3476
]
3577
}

‎cypress/fixtures/b2b-mp/mp/data-import/failed_merchant_combined_product.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
abstract_sku,is_active,concrete_sku,store_relations,product_abstract.categories,product.name.en_US,product.name.de_DE,product_abstract.name.en_US,product_abstract.name.de_DE,product.description.en_US,product.description.de_DE,product_abstract.description.en_US,product_abstract.description.de_DE,product_abstract.meta_title.en_US,product_abstract.meta_title.de_DE,product_abstract.meta_description.en_US,product_abstract.meta_description.de_DE,product_abstract.tax_set_name,product_abstract.new_from,product_abstract.new_to,product_abstract.meta_keywords.en_US,product_abstract.meta_keywords.de_DE,product.pc_operating_system,product.pc_operating_system.en_US,product.pc_operating_system.de_DE,product_abstract.url.en_US,product_abstract.url.de_DE,product.is_quantity_splittable,product.is_searchable.en_US,product.is_searchable.de_DE,product.assigned_product_type,"product.{WAREHOUSE_NAME}.quantity","product.{WAREHOUSE_NAME}.is_never_out_of_stock",product_price.DE.default.EUR.value_net,product_price.DE.default.EUR.value_gross,abstract_product_price.DE.default.EUR.value_net,abstract_product_price.DE.default.EUR.value_gross,product_image.DEFAULT.default.sort_order,product_image.DEFAULT.default.external_url_large,product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.sort_order,abstract_product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.external_url_large,abstract_product_image.de_DE.default.sort_order,abstract_product_image.de_DE.default.external_url_small,abstract_product_image.de_DE.default.external_url_large
1+
abstract_sku,is_active,concrete_sku,store_relations,product_abstract.categories,product.name.en_US,product.name.de_DE,product_abstract.name.en_US,product_abstract.name.de_DE,product.description.en_US,product.description.de_DE,product_abstract.description.en_US,product_abstract.description.de_DE,product_abstract.meta_title.en_US,product_abstract.meta_title.de_DE,product_abstract.meta_description.en_US,product_abstract.meta_description.de_DE,product_abstract.tax_set_name,product_abstract.new_from,product_abstract.new_to,product_abstract.meta_keywords.en_US,product_abstract.meta_keywords.de_DE,product.pc_operating_system,product.pc_operating_system.en_US,product.pc_operating_system.de_DE,product_abstract.url.en_US,product_abstract.url.de_DE,product.is_quantity_splittable,product.is_searchable.en_US,product.is_searchable.de_DE,product.assigned_product_type,"product_stock.{WAREHOUSE_NAME}.quantity","product_stock.{WAREHOUSE_NAME}.is_never_out_of_stock",product_price.DE.default.EUR.value_net,product_price.DE.default.EUR.value_gross,abstract_product_price.DE.default.EUR.value_net,abstract_product_price.DE.default.EUR.value_gross,product_image.DEFAULT.default.sort_order,product_image.DEFAULT.default.external_url_large,product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.sort_order,abstract_product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.external_url_large,abstract_product_image.de_DE.default.sort_order,abstract_product_image.de_DE.default.external_url_small,abstract_product_image.de_DE.default.external_url_large
22
"PRODUCT-{UNIQUE}",1,PRODUCT-{UNIQUE}_0001,NOT-EXISTING,100-cer,"Smart Watch Epsilon {UNIQUE} US","Smart Watch Epsilon {UNIQUE} DE","Abstract Smart Watch Epsilon {UNIQUE} US","Abstract Smart Watch Epsilon {UNIQUE} DE",,,,,,,,,Standard Taxes,,,,,pc_operating_system-{UNIQUE},PC Operating System {UNIQUE} US,PC Operating System {UNIQUE} DE,/en/product-{UNIQUE}-0001,/de/product-{UNIQUE}-0001,0,1,1,both,100,1,8000,9600,,,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg

‎cypress/fixtures/b2b-mp/mp/data-import/one_merchant_combined_product.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
abstract_sku,is_active,concrete_sku,store_relations,product_abstract.categories,product.name.en_US,product.name.de_DE,product_abstract.name.en_US,product_abstract.name.de_DE,product.description.en_US,product.description.de_DE,product_abstract.description.en_US,product_abstract.description.de_DE,product_abstract.meta_title.en_US,product_abstract.meta_title.de_DE,product_abstract.meta_description.en_US,product_abstract.meta_description.de_DE,product_abstract.tax_set_name,product_abstract.new_from,product_abstract.new_to,product_abstract.meta_keywords.en_US,product_abstract.meta_keywords.de_DE,product.pc_operating_system,product.pc_operating_system.en_US,product.pc_operating_system.de_DE,product_abstract.url.en_US,product_abstract.url.de_DE,product.is_quantity_splittable,product.is_searchable.en_US,product.is_searchable.de_DE,product.assigned_product_type,"product.{WAREHOUSE_NAME}.quantity","product.{WAREHOUSE_NAME}.is_never_out_of_stock",product_price.DE.default.EUR.value_net,product_price.DE.default.EUR.value_gross,abstract_product_price.DE.default.EUR.value_net,abstract_product_price.DE.default.EUR.value_gross,product_image.DEFAULT.default.sort_order,product_image.DEFAULT.default.external_url_large,product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.sort_order,abstract_product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.external_url_large,abstract_product_image.de_DE.default.sort_order,abstract_product_image.de_DE.default.external_url_small,abstract_product_image.de_DE.default.external_url_large
1+
abstract_sku,is_active,concrete_sku,store_relations,product_abstract.categories,product.name.en_US,product.name.de_DE,product_abstract.name.en_US,product_abstract.name.de_DE,product.description.en_US,product.description.de_DE,product_abstract.description.en_US,product_abstract.description.de_DE,product_abstract.meta_title.en_US,product_abstract.meta_title.de_DE,product_abstract.meta_description.en_US,product_abstract.meta_description.de_DE,product_abstract.tax_set_name,product_abstract.new_from,product_abstract.new_to,product_abstract.meta_keywords.en_US,product_abstract.meta_keywords.de_DE,product.pc_operating_system,product.pc_operating_system.en_US,product.pc_operating_system.de_DE,product_abstract.url.en_US,product_abstract.url.de_DE,product.is_quantity_splittable,product.is_searchable.en_US,product.is_searchable.de_DE,product.assigned_product_type,"product_stock.{WAREHOUSE_NAME}.quantity","product_stock.{WAREHOUSE_NAME}.is_never_out_of_stock",product_price.DE.default.EUR.value_net,product_price.DE.default.EUR.value_gross,abstract_product_price.DE.default.EUR.value_net,abstract_product_price.DE.default.EUR.value_gross,product_image.DEFAULT.default.sort_order,product_image.DEFAULT.default.external_url_large,product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.sort_order,abstract_product_image.DEFAULT.default.external_url_small,abstract_product_image.DEFAULT.default.external_url_large,abstract_product_image.de_DE.default.sort_order,abstract_product_image.de_DE.default.external_url_small,abstract_product_image.de_DE.default.external_url_large
22
"PRODUCT-{UNIQUE}",1,"PRODUCT-{UNIQUE}_0001",DE,100-cer,"Smart Watch Epsilon {UNIQUE} US","Smart Watch Epsilon {UNIQUE} DE","Abstract Smart Watch Epsilon {UNIQUE} US","Abstract Smart Watch Epsilon {UNIQUE} DE",,,,,,,,,Standard Taxes,,,,,pc_operating_system-{UNIQUE},PC Operating System {UNIQUE} US,PC Operating {UNIQUE} DE,/en/product-{UNIQUE}-0001,/de/product-{UNIQUE}-0001,0,1,1,both,100,1,8000,9600,,,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg,1,https://example.com/images/epsilon_large.jpg,https://example.com/images/epsilon_small.jpg

‎cypress/fixtures/b2b-mp/mp/data-import/one_merchant_combined_product_offer.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
offer_reference,concrete_sku,is_active,store_relations,stock.{WAREHOUSE_NAME}.quantity
2-
OFFER-{UNIQUE},{PRODUCT_SKU},1,DE,10
1+
offer_reference,concrete_sku,is_active,store_relations,stock.{WAREHOUSE_NAME}.quantity,price.DE.default.EUR.value_net,price.DE.default.EUR.value_gross
2+
OFFER-{UNIQUE},{PRODUCT_SKU},1,DE,10,10000,19000

‎cypress/support/types/mp/data-import.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import { User, Merchant, ProductConcrete } from './shared';
1+
import { User, Merchant, ProductConcrete, Customer } from './shared';
22

33
export interface MerchantCombinedProductDynamicFixtures {
44
rootUser: User;
55
merchantUser: User;
66
merchant: Merchant;
7+
customer: Customer;
78
}
89

910
export interface MerchantCombinedProductOfferDynamicFixtures {
1011
rootUser: User;
1112
merchantUser: User;
1213
merchant: Merchant;
1314
product: ProductConcrete;
15+
customer: Customer;
1416
}
1517

1618
export interface MerchantCombinedProductStaticFixtures {

0 commit comments

Comments
 (0)