Change type to var

config/localization.yaml

@@ -32,6 +32,11 @@ default:
             successfulAccountCreation: Your account has been created. Log in with your email address and password.
             emailDoesNotExistError: The email address you entered doesn't exist. Please try again.
             incorrectPasswordError: The password you entered is incorrect. Please try again.
+    CheckoutPages:
+        shippingAddressFormTitle: Enter a shipping address
+        newShippingAddressFormTitle: Add a new shipping address
+        billingAddressFormTitle: Enter a billing address
+        newBillingAddressFormTitle: Add a new billing address
     General:
         addresses:
             fullname: Full name*

src/test/java/posters/cucumber/features/Order.feature

@@ -5,28 +5,29 @@ Feature: Order
     Given "<browser>" is open
       And product page "<productUrl>" is open
      When I add this product with size "<productSize>" and style "<productStyle>" to the cart
-      And I specify the shipping address "<name>", "<company>", "<address>", "<city>", "<state>", "<zip>", "<country>" and use it for billing
+      And I specify the shipping address "<firstName>", "<lastName>", "<name>", "<company>", "<address>", "<city>", "<state>", "<zip>", "<country>", "<sameBillingAddress>" and use it for billing
       And I enter payment data "<name>", "<cardNumber>", "<month>", "<year>"
      Then I see all the products in order overview
       And my shipping and billing addresses as well as payment data are displayed correctly
       And my order is successfully placed
 
     @Chrome
     Examples: 
-      | browser         | productUrl                               | productSize | productStyle | name  | company             | address     | city           | state    | zip   | country       | cardNumber       | month | year |
-      | Chrome_1024x768 | productDetail/Grizzly%20Bear?productId=1 | 32 x 24 in  | gloss        | James | Monster Corporation | 621 Wall St | North Tonawada | New York | 14120 | United States | 4111111111111111 |    05 | 2021 |
+      | browser         | productUrl                               | productSize | productStyle | firstName | lastName | name  | company             | address     | city           | state    | zip   | country       | cardNumber       | month | year | sameBillingAddress |
+      | Chrome_1024x768 | productDetail/Grizzly%20Bear?productId=1 | 32 x 24 in  | gloss        |  Jakobi   | Doe      | James | Monster Corporation | 621 Wall St | North Tonawada | New York | 14120 | United States | 4111111111111111 |    05 | 2021 | false              |
+      | Chrome_1024x768 | productDetail/Grizzly%20Bear?productId=1 | 32 x 24 in  | gloss        |  Jakobi   | Doe      | James | Monster Corporation | 621 Wall St | North Tonawada | New York | 14120 | United States | 4111111111111111 |    05 | 2021 | true               |
 
     @Firefox
     Examples: 
-      | browser          | productUrl                               | productSize | productStyle | name  | company             | address     | city           | state    | zip   | country       | cardNumber       | month | year |
-      | Firefox_1024x768 | productDetail/Grizzly%20Bear?productId=1 | 32 x 24 in  | gloss        | James | Monster Corporation | 621 Wall St | North Tonawada | New York | 14120 | United States | 4111111111111111 |    05 | 2021 |
+      | browser          | productUrl                               | productSize | productStyle | firstName | lastName | name  | company             | address     | city           | state    | zip   | country       | cardNumber       | month | year | sameBillingAddress |
+      | Firefox_1024x768 | productDetail/Grizzly%20Bear?productId=1 | 32 x 24 in  | gloss        |  Jakobi   | Doe      | James | Monster Corporation | 621 Wall St | North Tonawada | New York | 14120 | United States | 4111111111111111 |    05 | 2021 | false              |
 
   @DeleteUserAfterwards 
-  Scenario Outline: Order some products as User
+  Scenario Outline: Order some products as registered User
     Given "<browser>" is open
       And new user with "<firstName>", "<lastName>", "<email>", "<password>" is registered and logged in
      When I add product "<productUrl>" in size "<productSize>" and style "<productStyle>"
-      And I specify the shipping address "<name>", "<company>", "<address>", "<city>", "<state>", "<zip>", "<country>" and use it for billing
+      And I specify the shipping address "<firstName>", "<lastName>", "<name>", "<company>", "<address>", "<city>", "<state>", "<zip>", "<country>", "<sameBillingAddress>" and use it for billing
       And I enter payment data "<name>", "<cardNumber>", "<month>", "<year>"
      Then I see all the products in order overview
       And my shipping and billing addresses as well as payment data are displayed correctly

src/test/java/posters/cucumber/support/BrowseRandomVisualAssertSupport.java

@@ -10,7 +10,7 @@
 import io.cucumber.java.en.When;
 import posters.pageobjects.pages.browsing.CategoryPage;
 import posters.pageobjects.pages.browsing.HomePage;
-import posters.pageobjects.pages.browsing.ProductdetailPage;
+import posters.pageobjects.pages.browsing.ProductDetailPage;
 
 public class BrowseRandomVisualAssertSupport
 {
@@ -21,8 +21,8 @@ public class BrowseRandomVisualAssertSupport
     @Given("^homepage is open")
     public void openHomePageAndValidate()
     {
-        HomePage homepage = OpenPageFlows.homepage();
-        homepage.validateAndVisualAssert();
+        var homePage = OpenPageFlows.homePage();
+        homePage.validateAndVisualAssert();
     }
 
     @When("^I choose random sub category with seed \"([^\"]*)\"$")
@@ -37,8 +37,7 @@ public void openRandomSubCategoryAndValidate(String seed)
             random = new Random(Long.valueOf(seed));
         }
         String categoryName = new HomePage().topNav.getRandomSubcategoryName(random);
-        CategoryPage categoryPage = new HomePage().topNav.clickSubcategoryByName(categoryName);
-        categoryPage.isExpectedPage();
+        var categoryPage = new HomePage().topNav.clickSubcategoryByName(categoryName);
         categoryPage.validateAndVisualAssert(categoryName);
     }
 
@@ -52,7 +51,7 @@ public void openRandomProduct()
     @Then("^I see correct product")
     public void validateProduct()
     {
-        new ProductdetailPage().validateAndVisualAssert(productName);
+        new ProductDetailPage().validateAndVisualAssert(productName);
     }
 
 }

src/test/java/posters/cucumber/support/CartSupport.java

@@ -3,7 +3,7 @@
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 import posters.dataobjects.Product;
-import posters.pageobjects.pages.browsing.ProductdetailPage;
+import posters.pageobjects.pages.browsing.ProductDetailPage;
 import posters.pageobjects.pages.checkout.CartPage;
 import posters.pageobjects.utility.PriceHelper;
 
@@ -20,15 +20,14 @@ public CartSupport(GlobalStorage storage)
     @When("^I open the cart$")
     public void openCart()
     {
-        CartPage cartPage = new ProductdetailPage().miniCart.openCartPage();
-        cartPage.isExpectedPage();
+        new ProductDetailPage().miniCart.openCartPage();
     }
 
     @Then("^I see all the added products in the cart and their properties are correct$")
     public void validateProductsInTheCart()
     {
         double subtotal = 0.0;
-        CartPage cartPage = new CartPage();
+        var cartPage = new CartPage();
 
         for (Product product : storage.products)
         {
@@ -39,25 +38,18 @@ public void validateProductsInTheCart()
     }
 
     @Then("^I can change amount of the \"([^\"]*)\" with \"([^\"]*)\" and \"([^\"]*)\" to (\\d+)$")
-    public void updateCountOfProduct(String productName, String size, String style, int amount)
+    public void updateCountOfProduct(String name, String size, String style, int amount)
     {
-        CartPage cartPage = new CartPage();
-        cartPage.updateProductCountByName(productName, style, size, amount);
-        for (Product product : storage.products)
-        {
-            if (product.getName().equals(productName) && product.getSize().equals(size)
-                && product.getStyle().equals(style))
-            {
-                product.setAmount(amount);
-            }
-            cartPage.validateContainsProduct(product);
-        }
+        var cartPage = new CartPage();
+        cartPage.updateProductCountByName(name, style, size, amount);
+
+        storage.updateCountOfProduct(name, size, style, amount);
     }
 
     @Then("^I can remove \"([^\"]*)\" with \"([^\"]*)\" and \"([^\"]*)\"$")
     public void removeProduct(String productName, String size, String style)
     {
-        CartPage cartPage = new CartPage();
+        var cartPage = new CartPage();
         cartPage.removeProductByName(productName, style, size);
 
         storage.removeProduct(productName, style, size);

src/test/java/posters/cucumber/support/GlobalStorage.java

@@ -1,6 +1,3 @@
-/**
- * 
- */
 package posters.cucumber.support;
 
 import java.util.ArrayList;
@@ -38,9 +35,8 @@ public Product addProduct(Product product)
         // increase amount of product if already there or add the whole product
         if (products.contains(product))
         {
-            Product updatedProduct = products.get(products.indexOf(product));
-            updatedProduct.setAmount(updatedProduct.getAmount() + 1);
-            return updatedProduct;
+            updateCountOfProduct(product.getName(), product.getSize(), product.getStyle(), product.getAmount() + 1);
+            return getProductFromArrayList(product.getName(), product.getSize(), product.getStyle());
         }
         else
         {
@@ -49,15 +45,31 @@ public Product addProduct(Product product)
         }
     }
 
-    public void removeProduct(String productName, String style, String size)
+    public Product getProductFromArrayList(String name, String size, String style)
     {
+        int i = 0;
         for (Product product : products)
         {
-            if (product.getName().equals(productName) && product.getSize().equals(size)
-                && product.getStyle().equals(style))
+            if (product.getName().equals(name) && product.getSize().equals(size) && product.getStyle().equals(style))
             {
-                products.remove(product);
+                i = products.indexOf(product);
             }
         }
+        return products.get(i);
+    }
+
+    public void updateCountOfProduct(String name, String size, String style, int amount)
+    {
+        var updateProducht = getProductFromArrayList(name, size, style);
+        String unitPrice = updateProducht.getUnitPrice();
+        products.remove(products.indexOf(updateProducht));
+        updateProducht = new Product(name, unitPrice, style, size, amount);
+        products.add(updateProducht);
+    }
+
+    public void removeProduct(String name, String style, String size)
+    {
+        var updateProducht = getProductFromArrayList(name, size, style);
+        products.remove(products.indexOf(updateProducht));
     }
 }

src/test/java/posters/cucumber/support/HomePageSupport.java

@@ -1,17 +1,14 @@
 package posters.cucumber.support;
 
 import io.cucumber.java.en.Then;
-import io.qameta.allure.Step;
 import posters.pageobjects.pages.browsing.HomePage;
 
 public class HomePageSupport
 {
     @Then("^I see homepage with logo, carousel, hot products and footer and it's title is \"([^\"]*)\"$")
-    @Step("validate homepage")
     public void validateHomePage(String title)
     {
-        HomePage homePage = new HomePage();
-        homePage.isExpectedPage();
+        var homePage = new HomePage();
         homePage.title.validateTitle(title);
         homePage.validateStructure();
         homePage.footer.validate();

src/test/java/posters/cucumber/support/OpenPageFlows.java

@@ -6,60 +6,49 @@
 import com.xceptance.neodymium.util.Neodymium;
 
 import io.cucumber.java.en.Given;
-import io.qameta.allure.Step;
 import posters.pageobjects.pages.browsing.HomePage;
-import posters.pageobjects.pages.browsing.ProductdetailPage;
+import posters.pageobjects.pages.browsing.ProductDetailPage;
 import posters.pageobjects.pages.user.LoginPage;
 import posters.pageobjects.pages.user.RegisterPage;
 
 public class OpenPageFlows
 {
     @Given("^homepage is loaded$")
-    @Step("open home page")
-    public static HomePage homepage()
+    public static HomePage homePage()
     {
         // clear cookies to ensure a new session
         clearBrowserCookies();
         // open home page
         open(Neodymium.configuration().url());
-        HomePage homePage = new HomePage();
-        homePage.isExpectedPage();
-        return homePage;
+        return new HomePage().isExpectedPage();
     };
 
     @Given("^login page is loaded$")
-    @Step("open login page")
     public static LoginPage loginPage()
     {
         // open login page and check for expected page
-        LoginPage loginPage = homepage().userMenu.openLogin();
-        loginPage.isExpectedPage();
-        return loginPage;
+        return homePage().userMenu.openLogin();
     };
 
     @Given("^register page is loaded$")
-    @Step("open register page")
     public static RegisterPage registerPage()
     {
         // open login page and check for expected page
-        RegisterPage registerPage = homepage().userMenu.openRegister();
-        registerPage.isExpectedPage();
-        return registerPage;
+        return homePage().userMenu.openRegister();
     };
 
     @Given("^product page \"([^\"]*)\" is open$")
-    @Step("open product page with cleared cookes")
-    public static ProductdetailPage openProductdetailsPageWithClearedCookes(String url)
+    public static ProductDetailPage openProductDetailsPageWithClearedCookes(String url)
     {
         clearBrowserCookies();
         open(Neodymium.configuration().url() + url);
-        return new ProductdetailPage();
+        return new ProductDetailPage().isExpectedPage();
     }
 
-    @Step("open product page without cleared cookes")
-    public static ProductdetailPage openProductdetailsPage(String url)
+    // TODO check if needed - else delete
+    public static ProductDetailPage openProductDetailsPage(String url)
     {
         open(Neodymium.configuration().url() + url);
-        return new ProductdetailPage();
+        return new ProductDetailPage().isExpectedPage();
     }
 }