provide active language fixture

wheelcms · Nov 14, 2013 · adb1756 · adb1756
1 parent e1357e4
commit adb1756
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/wheelcms_axle/tests/fixtures.py b/wheelcms_axle/tests/fixtures.py
@@ -51,3 +51,12 @@ def fin():
         settings.FALLBACK = old_fallback
     request.addfinalizer(fin)
 
+from django.utils import translation
+
+@pytest.fixture()
+def active_language(request):
+    old_lang = translation.get_language()
+    def fin():
+        translation.activate(old_lang)
+    request.addfinalizer(fin)
+
diff --git a/wheelcms_axle/tests/test_handler.py b/wheelcms_axle/tests/test_handler.py
@@ -581,9 +581,9 @@ def test_reorder_after(self, client):
         assert n1.position > n3.position
         assert n3.position > n2.position
 
-from .fixtures import multilang_ENNL
+from .fixtures import multilang_ENNL, active_language
 
-@pytest.mark.usefixtures("multilang_ENNL")
+@pytest.mark.usefixtures("multilang_ENNL", "active_language")
 class TestTranslations(object):
     def test_translated(self, client):
         """ /a can point to either dutch or english content on different

diff --git a/wheelcms_axle/tests/test_toolbar.py b/wheelcms_axle/tests/test_toolbar.py
@@ -259,9 +259,9 @@ def test_clipboard_copy(self, client):
         assert set(clipboard['items']) == set((t1, t2))
 
 from django.utils import translation
-from .fixtures import multilang_ENNLFR
+from .fixtures import multilang_ENNLFR, active_language
 
-@pytest.mark.usefixtures("localtyperegistry", "multilang_ENNLFR")
+@pytest.mark.usefixtures("localtyperegistry", "multilang_ENNLFR", "active_language")
 class TestTranslations(object):
     types = (Type1Type, Type2Type)
 

diff --git a/wheelcms_axle/tests/test_translations.py b/wheelcms_axle/tests/test_translations.py
@@ -1,11 +1,11 @@
 from wheelcms_axle.node import Node, DuplicatePathException
 from django.utils import translation
-from .fixtures import multilang_ENNLFR
+from .fixtures import multilang_ENNLFR, active_language
 
 import pytest
 
 
-@pytest.mark.usefixtures("multilang_ENNLFR")
+@pytest.mark.usefixtures("multilang_ENNLFR", "active_language")
 class TestRootNode(object):
     def test_disabled(self, client):
         """ multi language support disabled """
@@ -45,7 +45,7 @@ def test_default(self, client):
 
     ## root cannot be renamed
 
-@pytest.mark.usefixtures("multilang_ENNLFR")
+@pytest.mark.usefixtures("multilang_ENNLFR", "active_language")
 class TestNode(object):
     def test_node(self, client):
         translation.activate('en')