Skip to content
This repository has been archived by the owner on Mar 31, 2021. It is now read-only.

Misc fixes #320

Merged
merged 4 commits into from
Aug 20, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ describe('Create material tracking contract conditions', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});

Expand All @@ -97,7 +96,6 @@ describe('Create material tracking contract conditions', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(scrapProductName)
.setValue(scrapProductName)
.setProductType(productType)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand All @@ -106,7 +104,6 @@ describe('Create material tracking contract conditions', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(processingFeeProductName)
.setValue(processingFeeProductName)
.setProductType(productType)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand All @@ -115,7 +112,6 @@ describe('Create material tracking contract conditions', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productionProductName)
.setValue(productionProductName)
.setProductType(productType)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand All @@ -124,7 +120,6 @@ describe('Create material tracking contract conditions', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(witholdingProductName)
.setValue(witholdingProductName)
.setProductType(productType)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand Down Expand Up @@ -157,7 +152,6 @@ describe('Create material tracking contract conditions', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(rawProductName)
.setValue(rawProductName)
.setProductType('Item')
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ describe('Create a single HU', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productName)
.apply();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ describe('Aggregated-HUs inventory test', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.apply();
});
});
Expand Down
1 change: 0 additions & 1 deletion cypress/integration/inventory/inventory_singleHU_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ describe('Create a single HU', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productName)
.apply();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ describe('create new packing instructions ', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ describe('Change warehouse to Materialentnahmelager', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryName)
.apply();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ describe('New discount schema Test', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryName)
.apply();
});

cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productName)
.setProductType('Service')
.apply();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ describe('Create material receipt with quality issue', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryName)
.apply();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ describe('Create the 3 products ', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName1)
.setValue(productName1)
.setProductType(productType)
.setProductCategory(productCategoryName1)
.addCUTUAllocation(packingInstructionsName1)
Expand All @@ -129,7 +128,6 @@ describe('Create the 3 products ', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName2)
.setValue(productName2)
.setProductType(productType)
.setProductCategory(productCategoryName1)
.addCUTUAllocation(packingInstructionsName1)
Expand All @@ -142,7 +140,6 @@ describe('Create the 3 products ', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName3)
.setValue(productName3)
.setProductType(productType)
.setProductCategory(productCategoryName2)
.addCUTUAllocation(packingInstructionsName1)
Expand Down Expand Up @@ -231,7 +228,6 @@ function createProductCategory(productCategoryName, attributeSet) {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryName)
.setAttributeSet(attributeSet)
.apply();
});
Expand Down
2 changes: 0 additions & 2 deletions cypress/integration/product/change_product_price_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});
});
Expand All @@ -37,7 +36,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.addProductPrice(productPrice)
.setSold(false)
Expand Down
3 changes: 0 additions & 3 deletions cypress/integration/product/create_bill_of_material.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});
});
Expand All @@ -28,7 +27,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.setStocked(true)
.setPurchased(true)
Expand All @@ -44,7 +42,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productComponentName)
.setValue(productComponentValue)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.setStocked(true)
.setPurchased(true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});
});
Expand All @@ -22,7 +21,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.setStocked(true)
.setPurchased(true)
Expand Down
2 changes: 0 additions & 2 deletions cypress/integration/product/product_packing_item_setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ describe('Create Test: set packing item in product window https://github.com/met
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});
});
Expand All @@ -21,7 +20,6 @@ describe('Create Test: set packing item in product window https://github.com/met
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.apply();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});
});
Expand All @@ -22,7 +21,6 @@ describe('Create Product', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.apply();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ describe('Create Purchase order - complete - change - complete', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ describe('Create Purchase order - complete - reactivate - complete', function()
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ describe('Create Purchase order from sales order', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productForPackingMaterial)
.setValue(productForPackingMaterial)
.setProductType(productType)
.setProductCategory('24_Gebinde')
.addProductPrice(productPricePM1)
Expand Down Expand Up @@ -76,7 +75,6 @@ describe('Create Purchase order from sales order', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryName)
.apply();
});
/**Create vendor to use in product - Business partner tab - current vendor */
Expand Down Expand Up @@ -112,7 +110,6 @@ describe('Create Purchase order from sales order', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName1)
.setValue(productName1)
.setProductType(productType)
.setProductCategory(productCategoryName + '_' + productCategoryName)
.addProductPrice(productPrice1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ describe('Create test data', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryName)
.apply();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ describe('Create new Stock Control Purchase', function() {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryName)
.apply();
});

Expand All @@ -36,7 +35,6 @@ describe('Create new Stock Control Purchase', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName1)
.setValue(productName1)
.setProductType(productType)
.setProductCategory(productCategoryName + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand All @@ -48,7 +46,6 @@ describe('Create new Stock Control Purchase', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName2)
.setValue(productName2)
.setProductType(productType)
.setProductCategory(productCategoryName + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand All @@ -60,7 +57,6 @@ describe('Create new Stock Control Purchase', function() {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName3)
.setValue(productName3)
.setProductType(productType)
.setProductCategory(productCategoryName + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand Down
4 changes: 0 additions & 4 deletions cypress/support/utils/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export class Builder {
cy.fixture('product/simple_productCategory.json').then(productCategoryJson => {
Object.assign(new ProductCategory(), productCategoryJson)
.setName(productCategoryName)
.setValue(productCategoryValue)
.apply();
});

Expand All @@ -62,7 +61,6 @@ export class Builder {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.setProductType(productType)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand All @@ -87,7 +85,6 @@ export class Builder {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.setProductType(productType)
.setProductCategory(productCategoryValue + '_' + productCategoryName)
.addProductPrice(productPrice)
Expand All @@ -111,7 +108,6 @@ export class Builder {
cy.fixture('product/simple_product.json').then(productJson => {
Object.assign(new Product(), productJson)
.setName(productName)
.setValue(productValue)
.setProductType(productType)
.setProductCategory(categoryName)
.addProductPrice(productPrice)
Expand Down
15 changes: 1 addition & 14 deletions cypress/support/utils/product.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ export class Product {
return this;
}

setValue(value) {
cy.log(`Product value is never used`);
this.value = value;
return this;
}

setDescription(description) {
cy.log(`Product - set description = ${description}`);
this.description = description;
Expand Down Expand Up @@ -203,12 +197,6 @@ export class ProductCategory {
return this;
}

setValue(value) {
cy.log(`Product Category - set value = ${value}`);
this.value = value;
return this;
}

setAttributeSet(attributeSet) {
cy.log(`Product Category - set attributeSet = ${attributeSet}`);
this.attributeSet = attributeSet;
Expand All @@ -226,8 +214,7 @@ export class ProductCategory {
cy.visitWindow('144', 'NEW');
cy.writeIntoStringField('Name', productCategory.name);

// Value can be updated
cy.writeIntoStringField('Value', productCategory.value);
cy.writeIntoStringField('Value', productCategory.name);
if (productCategory.attributeSet) {
TheBestPessimist marked this conversation as resolved.
Show resolved Hide resolved
cy.selectInListField('M_AttributeSet_ID', productCategory.attributeSet);
}
Expand Down