#685 Grade django to 1.11.17 (#686)

* Grade django to 1.11.17

* Remove --liveserver argument from tests. Create LIVESERVER_{PORT,HOST}.

* Remove LIVESERVER_PORT. Fix rendering of payment types.

* Trigger CI

* Finish with host address for selenium

* Self-review fixes

.drone.yml

@@ -83,7 +83,7 @@ pipeline:
   slow-test:
     <<: *test
     commands:
-      - python manage.py test --liveserver=slow-test:8021-8029 --parallel --tag slow -k -v 3
+      - python manage.py test --parallel --tag slow -k -v 3
 
   lint-coala:
     <<: *lint

README.md

@@ -69,8 +69,7 @@ dc exec app python manage.py price
 make test
 
 # запускаем один тест
-dc exec app python manage.py test -v 3 --liveserver=app:8021-8029 \
-    stroyprombeton.tests.tests_selenium.CartTestCase.buy_on_product_page
+dc exec app python manage.py test shopelectro.tests.tests_selenium.TestClass.test_method
 ```
 
 #### Fixtures

docker/Makefile

@@ -46,7 +46,7 @@ collectstatic:
 
 test: build-static
 	$(dc) up -d app selenium
-	$(dc) exec app python manage.py test -v 3 --liveserver=app-server:8020-8030 --parallel
+	$(dc) exec app python manage.py test -v 3 --parallel
 	$(dc) stop
 
 lint-code:

docker/docker-compose.yml

@@ -17,7 +17,6 @@ x-app-base: &app-base
     - PYTHONUNBUFFERED=0
   ports:
     - $VIRTUAL_HOST_EXPOSE_PORT:$VIRTUAL_HOST_PORT
-    - $VIRTUAL_HOST_LIVESERVER_PORT
   networks:
     se-backend:
       aliases:

docker/drone_env/ports

@@ -1,6 +1,5 @@
 # Exposed ports
 VIRTUAL_HOST_PORT=8000
 VIRTUAL_HOST_EXPOSE_PORT=8012
-VIRTUAL_HOST_LIVESERVER_PORT=8020-8030
 VIRTUAL_HOST_STAGE_PORT=8001
 VIRTUAL_HOST_STAGE_EXPOSE_PORT=8011

docker/env_files/ports.dist

@@ -1,6 +1,5 @@
 # Exposed ports
 VIRTUAL_HOST_PORT=8000
 VIRTUAL_HOST_EXPOSE_PORT=8010
-VIRTUAL_HOST_LIVESERVER_PORT=8020-8030
 VIRTUAL_HOST_STAGE_PORT=8001
 VIRTUAL_HOST_STAGE_EXPOSE_PORT=8011

requirements.txt

@@ -5,7 +5,7 @@ beautifulsoup4
 
 # celery==4.2.2
 git+https://github.com/celery/celery.git@1c3a15938d0b9dde674d4666689d6a6c733d64e4#egg=celery
-Django==1.10
+Django==1.11.17
 django-debug-toolbar==1.10.1
 django-extensions
 django-redis==4.8.0

shopelectro/settings/base.py

@@ -11,6 +11,7 @@
 """
 
 import os
+import socket
 from datetime import datetime
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -221,6 +222,9 @@
 }
 
 TEST_RUNNER = 'refarm_test_utils.runners.RefarmTestRunner'
+# address for selenium-based tests
+# host name doesn't resolve at CI, so we have to use host address
+LIVESERVER_HOST = socket.gethostbyname(socket.gethostname())
 
 SITE_CREATED = datetime(2013, 1, 1)
 

shopelectro/tests/helpers.py

@@ -60,6 +60,7 @@ class SeleniumTestCase(LiveServerTestCase):
     """Common superclass for running selenium-based tests."""
 
     fixtures = ['dump.json']
+    host = settings.LIVESERVER_HOST
 
     @classmethod
     def setUpClass(cls):
@@ -89,7 +90,7 @@ def setUpClass(cls):
     def tearDownClass(cls):
         """Close selenium session."""
         cls.browser.quit()
-        super(SeleniumTestCase, cls).tearDownClass()
+        super().tearDownClass()
 
     @contextmanager
     def screen_fail(self, filename=''):

shopelectro/tests/tests_selenium_mobile.py

@@ -19,6 +19,7 @@ class MobileSeleniumTestCase(LiveServerTestCase):
     """Common superclass for running selenium-based tests."""
 
     fixtures = ['dump.json']
+    host = settings.LIVESERVER_HOST
 
     @classmethod
     def setUpClass(cls):

templates/ecommerce/order/payment_types.html

@@ -3,6 +3,6 @@
 {% for radio in form.payment_type %}
   <div class="payment-types-form-item">
     {{ radio }}
-    <img src="{% static 'images/pay/'|add:radio.choice_value|add:'.png' %}" >
+    <img src="{% static 'images/pay/'|add:radio.data.value|add:'.png' %}" >
   </div>
 {% endfor %}