Skip to content
This repository has been archived by the owner on Feb 23, 2020. It is now read-only.

rf#230 Refactor const name. CustomPage.ROUTE is the new one #389

Merged
merged 2 commits into from
Dec 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ Unidecode==1.0.22
ua-parser==0.8.0
user-agents==1.1.0
https://github.com/selwin/django-user_agents/archive/master.zip
https://github.com/fidals/refarm-site/archive/0.4.23.zip
https://github.com/fidals/refarm-site/archive/0.4.24.zip
4 changes: 2 additions & 2 deletions stroyprombeton/tests/tests_selenium.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from selenium.webdriver.common.by import By
from selenium.webdriver.support import expected_conditions as EC, ui

from pages.models import Page
from pages.models import CustomPage

from stroyprombeton import models as stb_models
from stroyprombeton.tests import helpers as test_helpers
Expand Down Expand Up @@ -182,7 +182,7 @@ def remove_product(self):
def proceed_order_page(self):
self.browser.get(
self.live_server_url +
reverse(Page.CUSTOM_PAGES_URL_NAME, args=('order', ))
reverse(CustomPage.ROUTE, args=('order', ))
)
self.wait.until(EC.visibility_of_element_located(
(By.TAG_NAME, 'h1')
Expand Down
4 changes: 2 additions & 2 deletions stroyprombeton/views/ecommerce.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from ecommerce import views as ec_views
from ecommerce.mailer import send_backcall
from pages.models import Page
from pages.models import CustomPage
from pages.views import CustomPageView

from stroyprombeton import mailer
Expand Down Expand Up @@ -56,7 +56,7 @@ class OrderPrice(FormView, CustomPageView):
form_class = PriceForm
template_name = 'ecommerce/order/price.html'
success_url = reverse_lazy(
Page.CUSTOM_PAGES_URL_NAME,
CustomPage.ROUTE,
current_app='stroyprombeton',
args=('price-success',)
)
Expand Down