#690 #498 #497 Make the check_purchase work

shopelectro/models.py

@@ -1,3 +1,4 @@
+import enum
 import random
 import string
 import typing
@@ -135,30 +136,48 @@ class ProductFeedback(models.Model):
         default='', blank=True, verbose_name=_('limitations'))
 
 
-def _default_payment():
-    """Default payment option is first element of first tuple in options."""
-    assert settings.PAYMENT_OPTIONS[0][0], 'No payment options!'
-    return settings.PAYMENT_OPTIONS[0][0]
+class ItemsEnum(enum.EnumMeta):
+    """
+    Provide dict-like `items` method.
+
+    https://docs.python.org/3/library/enum.html#enum-classes
+    """
+    def items(self):
+        return [(i.name, i.value) for i in self]
+
+    def __repr__(self):
+        fields = ', '.join(i.name for i in self)
+        return f"<enum '{self.__name__}: {fields}'>"
+
+
+class PaymentOptions(enum.Enum, metaclass=ItemsEnum):
+    cash = 'Наличные'
+    cashless = 'Безналичные и денежные переводы'
+    AC = 'Банковская карта'
+    PC = 'Яндекс.Деньги'
+    GP = 'Связной (терминал)'
+    AB = 'Альфа-Клик'
+
+    @staticmethod
+    def default():
+        return PaymentOptions.cash
 
 
 class Order(ecommerce_models.Order):
     address = models.TextField(blank=True, default='')
     payment_type = models.CharField(
         max_length=255,
-        choices=settings.PAYMENT_OPTIONS,
-        default=_default_payment()
+        choices=PaymentOptions.items(),
+        default=PaymentOptions.default().name,
     )
     comment = models.TextField(blank=True, default='')
     # total price - total purchase price
     revenue = models.FloatField(default=0, null=True, verbose_name=_('revenue'))
 
     @property
-    def payment_type_name(self):
-        """Return name for an order's payment option."""
-        return next(
-            name for option, name in settings.PAYMENT_OPTIONS
-            if self.payment_type == option
-        )
+    def payment_type_label(self):
+        """Return label for an order's payment option."""
+        return PaymentOptions[self.payment_type].value
 
     def set_positions(self, cart):
         """

shopelectro/selenium/conditions.py

@@ -0,0 +1,24 @@
+from selenium.common.exceptions import StaleElementReferenceException
+
+
+def alphanumeric(text: str) -> str:
+    return ''.join(filter(lambda c: c.isalnum(), text))
+
+
+class AlnumPresentedInValue:
+    """
+    Check if the given text is present in the element's locator, text.
+
+    Remove all non-alphanumeric characters before checking.
+    """
+
+    def __init__(self, locator, text):
+        self.locator = locator
+        self.text = text
+
+    def __call__(self, driver):
+        try:
+            text = driver.find_element(*self.locator).get_attribute('value')
+            return alphanumeric(self.text) in alphanumeric(text)
+        except StaleElementReferenceException:
+                return False

shopelectro/selenium/driver.py

@@ -10,9 +10,9 @@ class SiteDriver(Remote):
     """Provide convenient access to the site."""
 
     def __init__(self, *, site_url, **kwargs):
-        super().__init__(**kwargs)
         kwargs.setdefault('command_executor', settings.SELENIUM_URL)
         kwargs.setdefault('desired_capabilities', DesiredCapabilities.CHROME)
+        super().__init__(**kwargs)
 
         self.site_url = site_url
         self.wait = WebDriverWait(self, settings.SELENIUM_WAIT_SECONDS)

shopelectro/selenium/elements/__init__.py

@@ -1 +1,3 @@
+from .input import Input
+from .button import Button
 from .product_card import ProductCard

shopelectro/selenium/elements/button.py

@@ -0,0 +1,15 @@
+from shopelectro.selenium.driver import SiteDriver
+
+from selenium.webdriver.support import expected_conditions as EC
+
+
+class Button:
+
+    def __init__(self, driver: SiteDriver, locator):
+        self.driver = driver
+        self.locator = locator
+
+    def click(self):
+        self.driver.wait.until(EC.element_to_be_clickable(
+            self.locator
+        )).click()

shopelectro/selenium/elements/input.py

@@ -0,0 +1,22 @@
+import re
+
+from shopelectro.selenium.conditions import AlnumPresentedInValue
+from shopelectro.selenium.driver import SiteDriver
+
+from selenium.webdriver.support import expected_conditions as EC
+
+
+class Input:
+
+    def __init__(self, driver: SiteDriver, locator):
+        self.driver = driver
+        self.locator = locator
+
+    def send_keys(self, keys: str):
+        keys = str(keys)
+        if not re.match(r'[\w\d\s\-_]+', keys, re.I | re.U):
+            raise ValueError('Remove special symbols from text')
+        el = self.driver.wait.until(EC.element_to_be_clickable(self.locator))
+        el.clear()
+        el.send_keys(keys)
+        self.driver.wait.until(AlnumPresentedInValue(self.locator, keys))

shopelectro/selenium/elements/product_card.py

@@ -1,7 +1,7 @@
-from selenium.driver import SiteDriver
+from shopelectro.selenium.elements import Button
+from shopelectro.selenium.driver import SiteDriver
 
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
 
 
 class ProductCard:
@@ -14,9 +14,10 @@ def __init__(self, driver: SiteDriver, card_index: int):
         :param int card_index: The index number of the product card at a category page
         """
         self.driver = driver
-        self.button_xpath = f'//*[@id="products-wrapper"]/div[{card_index}]/div[2]/div[5]/button'
+        self.button = Button(
+            self.driver,
+            (By.XPATH, f'//*[@id="products-wrapper"]/div[{card_index}]/div[2]/div[5]/button')
+        )
 
     def add_to_cart(self):
-        self.driver.wait.until(
-            EC.visibility_of_element_located((By.XPATH, self.button_xpath))
-        ).click()
+        self.button.click()

shopelectro/selenium/pages/__init__.py

@@ -1,3 +1,4 @@
+from .page import Page
+
 from .category import CategoryPage
 from .order import OrderPage
-from .page import Page

shopelectro/selenium/pages/category.py

@@ -22,6 +22,7 @@ def product_cards(self) -> typing.List[ProductCard]:
         raise NotImplementedError
 
     def add_to_cart(self, product_cards: typing.List[ProductCard]=None):
-        product_cards = product_cards or self.product_cards()[:6]
+        default_cards = [ProductCard(self.driver, i) for i in range(1, 7)]
+        product_cards = product_cards or default_cards
         for card in product_cards:
             card.add_to_cart()

shopelectro/selenium/pages/order.py

@@ -1,5 +1,9 @@
+from shopelectro.models import PaymentOptions
+from shopelectro.selenium.elements import Input, Button
 from shopelectro.selenium.pages import Page
 
+from selenium.webdriver.common.by import By
+
 from pages.models import CustomPage
 
 # @todo #682:120m Implement and reuse shopelectro.selenium.OrderPage for selenium tests.
@@ -9,16 +13,37 @@ class OrderPage(Page):
 
     def __init__(self, driver):
         super().__init__(driver)
+        self.submit_button = Button(self.driver, (By.ID, 'submit-order'))
 
     @property
     def path(self):
         return CustomPage.objects.get(slug='order').url
 
-    def fill_contacts(self, contacts):
-        raise NotImplementedError
+    def fill_contacts(
+        self, name='Name', city='Санкт-Петербург', phone='2222222222', email='test@test.test',
+    ):
+        contacts = {
+            'id_name': name,
+            'id_city': city,
+            'id_phone': phone,
+            'id_email': email,
+        }
 
-    def make_order(self):
-        raise NotImplementedError
+        for id_, value in contacts.items():
+            Input(self.driver, (By.ID, id_)).send_keys(value)
 
-    def select_payment_type(self):
-        raise NotImplementedError
+    def make_order(self):
+        self.submit_button.click()
+
+    def select_payment_type(self, payment_option: PaymentOptions):
+        if payment_option not in PaymentOptions:
+            raise ValueError(
+                'An invalid payment type provided.'
+                f'It should be one of: {PaymentOptions}'
+            )
+
+        item = Button(
+            self.driver,
+            (By.CSS, f'input[name="payment_type"][value="{payment_type.name}"]'),
+        )
+        item.click()

shopelectro/selenium/pages/page.py

@@ -1,5 +1,8 @@
 from shopelectro.selenium import SiteDriver
 
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+
 
 class Page:
     """
@@ -9,7 +12,7 @@ class Page:
     """
 
     def __init__(self, driver: SiteDriver):
-        if not isinstance(self.driver, SiteDriver):
+        if not isinstance(driver, SiteDriver):
             raise TypeError('Driver must be an instance of shopelectro.selenium.SiteDriver')
         self.driver = driver
         self.path: str

shopelectro/settings/base.py

@@ -9,7 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.9/ref/settings/
 """
-
+import enum
 import os
 import socket
 from datetime import datetime
@@ -244,16 +244,6 @@
 # Used to retrieve instances in ecommerce.Cart
 CART_ID = 'cart'
 
-# Used to define choices attr in definition of Order.payment_type field
-PAYMENT_OPTIONS = (
-    ('cash', 'Наличные'),
-    ('cashless', 'Безналичные и денежные переводы'),
-    ('AC', 'Банковская карта'),
-    ('PC', 'Яндекс.Деньги'),
-    ('GP', 'Связной (терминал)'),
-    ('AB', 'Альфа-Клик'),
-)
-
 # It is fake-pass. Correct pass will be created on `docker-compose up` stage from `docker/.env`
 YANDEX_SHOP_PASS = os.environ.get('YANDEX_SHOP_PASS', 'so_secret_pass')
 

shopelectro/tasks.py

@@ -61,9 +61,8 @@ def update_catalog():
         collect_static()
     ]
 
-# @todo #682:60m Implement check_purchase.
-#  Handle errors. Report failed attempts.
-#  Schedule it in the celery beat.
+# @todo #690:60m Handle errors in check_purchase.
+#  Report failed attempts. Schedule it in the celery beat.
 
 
 @app.task

shopelectro/tests/tests_selenium.py

@@ -660,7 +660,6 @@ def buy_products(self):
             ).click()
 
     def select_payment_type(self, payment_type='cash'):
-        # @todo #473:15m Move `payment_type` to dict or dataclass
         input_item = self.browser.find_element_by_css_selector(
             f'input[name="payment_type"][value="{payment_type}"]'
         )
@@ -685,7 +684,6 @@ def expected_conditions(browser):
         insert_value('id_email', 'test@test.test')
 
     def submit_form(self):
-        # @todo #473:30m Hide all form processing methods to a separated class.
         self.click((By.ID, 'submit-order'))
 
     def test_table_is_presented_if_there_is_some_products(self):

templates/ecommerce/order/email.html

@@ -87,7 +87,7 @@
 
       <ul style="padding:0;list-style:none">
         <li style="margin:0 0 1em">Тип платежа:
-          <strong style="font-weight:bold">{{ order.payment_type_name }}</strong>
+          <strong style="font-weight:bold">{{ order.payment_type_label }}</strong>
         </li>
         <li style="margin:0 0 1em">Телефон:
           <strong style="font-weight:bold">{{ order.phone }}</strong>

templates/ecommerce/yandex_order_email.html

@@ -22,7 +22,7 @@
     </tr>
     <tr>
       <td>Способ оплаты</td>
-      <td>{{ order.payment_type_name }}</td>
+      <td>{{ order.payment_type_label }}</td>
     </tr>
     {% if order.comment %}
     <tr>