Fix tests

smotornyuk · smotornyuk · commit 53308452cc08 · 2023-01-24T11:16:14.000+02:00
diff --git a/changes/7350.removal b/changes/7350.removal
@@ -0,0 +1 @@
+``ckan.route_after_login`` renamed to ``ckan.auth.route_after_login``
diff --git a/ckan/tests/config/declaration/test_declaration.py b/ckan/tests/config/declaration/test_declaration.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import logging
 from ckan.common import CKANConfig
 from ckan.config.declaration.load import GroupV1, OptionV1
 import pytest
@@ -160,25 +159,16 @@ def test_normalize_convert_types(self):
         decl.normalize(cfg)
         assert cfg == CKANConfig({"a": 20})
 
-    @pytest.mark.parametrize("raw,safe,warned", [
-        ({}, {"a": "default"}, False),
-        ({"legacy_a": "legacy"}, {"a": "legacy", "legacy_a": "legacy"}, True),
-        ({"a": "modern", "legacy_a": "legacy"}, {"a": "modern", "legacy_a": "legacy"}, False),
+    @pytest.mark.parametrize("raw,safe", [
+        ({}, {"a": "default"}),
+        ({"legacy_a": "legacy"}, {"a": "legacy", "legacy_a": "legacy"}),
+        ({"a": "modern", "legacy_a": "legacy"}, {"a": "modern", "legacy_a": "legacy"}),
     ])
-    def test_legacy_key(self, raw, safe, warned, caplog):
+    def test_legacy_key(self, raw, safe):
         decl = Declaration()
         option = decl.declare(Key().a, "default")
         option.legacy_key = "legacy_a"
 
         cfg = CKANConfig(raw)
-        with caplog.at_level(logging.WARNING):
-            decl.make_safe(cfg)
-
-            if warned:
-                assert caplog.records
-                assert "legacy_a" in caplog.records[0].message
-
-            else:
-                assert not caplog.records
-
+        decl.make_safe(cfg)
         assert cfg == CKANConfig(safe)
diff --git a/ckan/views/user.py b/ckan/views/user.py
@@ -137,7 +137,7 @@ def index():
 
 def me() -> Response:
     return h.redirect_to(
-        config.get(u'ckan.route_after_login'))
+        config.get(u'ckan.auth.route_after_login'))
 
 
 def read(id: str) -> Union[Response, str]:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+``ckan.route_after_login`` renamed to ``ckan.auth.route_after_login``