[#4801] Update non-root test using weird URL and fix related bug in e…

…xample theme plugin
ckan · Dec 19, 2019 · e4d523e · e4d523e
1 parent 8ee2148
commit e4d523e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/ckan/tests/test_none_root.py b/ckan/tests/test_none_root.py
@@ -7,7 +7,7 @@
 @pytest.mark.ckan_config(u"ckan.plugins", u"example_theme_v15_fanstatic")
 @pytest.mark.usefixtures(u"with_plugins")
 def test_resource_url(app):
-    content = app.get(u"/en/base.html")
+    content = app.get(u"/")
     if u"example_theme.css" not in content:
         assert u"example_theme.min.css" in content
     assert u'href="/data/webassets/example_theme' in content
diff --git a/ckanext/example_theme_docs/custom_config_setting/plugin.py b/ckanext/example_theme_docs/custom_config_setting/plugin.py
@@ -30,7 +30,7 @@ def most_popular_groups():
     # Get a list of all the site's groups from CKAN, sorted by number of
     # datasets.
     groups = toolkit.get_action('group_list')(
-        data_dict={'sort': 'packages desc', 'all_fields': True})
+        data_dict={'sort': 'package_count desc', 'all_fields': True})
 
     # Truncate the list to the 10 most popular groups only.
     groups = groups[:10]

diff --git a/ckanext/example_theme_docs/v12_extra_public_dir/plugin.py b/ckanext/example_theme_docs/v12_extra_public_dir/plugin.py
@@ -10,7 +10,7 @@ def most_popular_groups():
     # Get a list of all the site's groups from CKAN, sorted by number of
     # datasets.
     groups = toolkit.get_action('group_list')(
-        data_dict={'sort': 'packages desc', 'all_fields': True})
+        data_dict={'sort': 'package_count desc', 'all_fields': True})
 
     # Truncate the list to the 10 most popular groups only.
     groups = groups[:10]

diff --git a/ckanext/example_theme_docs/v15_fanstatic/plugin.py b/ckanext/example_theme_docs/v15_fanstatic/plugin.py
@@ -10,7 +10,7 @@ def most_popular_groups():
     # Get a list of all the site's groups from CKAN, sorted by number of
     # datasets.
     groups = toolkit.get_action('group_list')(
-        data_dict={'sort': 'packages desc', 'all_fields': True})
+        data_dict={'sort': 'package_count desc', 'all_fields': True})
 
     # Truncate the list to the 10 most popular groups only.
     groups = groups[:10]

diff --git a/ckanext/example_theme_docs/v22_fanstatic_and_webassets/plugin.py b/ckanext/example_theme_docs/v22_fanstatic_and_webassets/plugin.py
@@ -10,7 +10,7 @@ def most_popular_groups():
     # Get a list of all the site's groups from CKAN, sorted by number of
     # datasets.
     groups = toolkit.get_action(u'group_list')(
-        data_dict={u'sort': u'packages desc', u'all_fields': True})
+        data_dict={u'sort': u'package_count desc', u'all_fields': True})
 
     # Truncate the list to the 10 most popular groups only.
     groups = groups[:10]