#394 Redirects dep. stb2 (#397)

* - Fix middleware name
- Fix redirects mutlideps
- Inherit redirects app from django's one
- Fix commented code volumes in dc.yml
- Change imports to new redirects app
- Fix commented test and refarm-site dependency
- Create test with unexpected behaviour explaining
- Refresh py reqs according to stb
- Fix rf dep version
- Rm unused import

docker/docker-compose.yml

@@ -30,7 +30,7 @@ services:
       # contains refarm-site modules
       - $DEPS_DIR
       # Thus, you can work with apps related to the refarm-site
-      # - $REFARM_SRC/search:/root/.local/lib/python3.6/site-packages/search
+      #- $REFARM_DIR/search:/root/.local/lib/python3.6/site-packages/search
     command: python manage.py runserver 0.0.0.0:$VIRTUAL_HOST_PORT
 
   nodejs:

requirements.txt

@@ -18,4 +18,4 @@ ua-parser==0.8.0
 user-agents==1.1.0
 sorl-thumbnail==12.4a1
 https://github.com/selwin/django-user_agents/archive/master.zip
-https://github.com/fidals/refarm-site/archive/0.1.6.zip
+https://github.com/fidals/refarm-site/archive/0.1.7.zip

shopelectro/settings/base.py

@@ -62,6 +62,7 @@
     'sorl.thumbnail',
     'django_select2',
     'images',
+    'refarm_redirects',
     'pages',
     'catalog',
     'search',
@@ -78,10 +79,10 @@
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django_user_agents.middleware.UserAgentMiddleware',
     'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'refarm_redirects.middleware.RedirectAllMiddleware',
 ]
 
 ROOT_URLCONF = 'shopelectro.urls'

shopelectro/tests/tests_views.py

@@ -5,7 +5,6 @@
 They all should be using Django's TestClient.
 """
 import json
-import unittest
 from functools import partial
 from itertools import chain
 from operator import attrgetter
@@ -573,8 +572,6 @@ class Redirects(TestCase):
 
     fixtures = ['dump.json']
 
-    # will be resurrected at rf#140
-    @unittest.expectedFailure
     def test_redirect_from_existing_page(self):
         """`refarm-site.redirects` app should redirect from existing url too."""
         # take some existing `url_from`