Merge branch 't12_macro_project_sorting'
diff --git a/Allura/allura/lib/macro.py b/Allura/allura/lib/macro.py
index d90a539..35d4d10 100644
--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -164,6 +164,10 @@
sort_key, sort_dir = 'name', pymongo.ASCENDING
elif sort == 'random':
sort_key, sort_dir = None, None
+ elif sort == 'last_registred':
+ sort_key, sort_dir = '_id', pymongo.DESCENDING
+ elif sort == '_id':
+ sort_key, sort_dir = '_id', pymongo.DESCENDING
projects = []
if private:
diff --git a/Allura/allura/tests/functional/test_wiki_macro.py b/Allura/allura/tests/functional/test_wiki_macro.py
new file mode 100644
index 0000000..e7603c4
--- /dev/null
+++ b/Allura/allura/tests/functional/test_wiki_macro.py
@@ -0,0 +1,60 @@
+from allura import model as M
+from allura.tests import TestController
+from allura.tests import decorators as td
+
+class TestNeighborhood(TestController):
+
+ @staticmethod
+ def get_project_names(r):
+ """
+ Extracts a list of project names from a wiki page HTML.
+ """
+ # projects short names are in h2 elements without any attributes
+ # there is one more h2 element, but it has `class` attribute
+ return [e.text for e in r.html.findAll('h2') if not e.attrs]
+
+ @staticmethod
+ def get_projects_property_in_the_same_order(names, prop):
+ """
+ Returns a list of projects properties `prop` in the same order as
+ project `names`.
+ It is required because results of the query are not in the same order as names.
+ """
+ projects = M.Project.query.find(dict(name={'$in': names})).all()
+ projects_dict = dict([(p['name'],p[prop]) for p in projects])
+ return [projects_dict[name] for name in names]
+
+ @td.with_wiki
+ def test_sort_alpha(self):
+ r = self.app.post('/p/wiki/Home/update',
+ params={
+ 'title': 'Home',
+ 'text': '[[projects sort=alpha]]'
+ },
+ extra_environ=dict(username='root'), upload_files=[]).follow()
+ project_list = self.get_project_names(r)
+ assert project_list == sorted(project_list)
+
+ @td.with_wiki
+ def test_sort_registered(self):
+ r = self.app.post('/p/wiki/Home/update',
+ params={
+ 'title': 'Home',
+ 'text': '[[projects sort=last_registred]]'
+ },
+ extra_environ=dict(username='root'), upload_files=[]).follow()
+ project_names = self.get_project_names(r)
+ ids = self.get_projects_property_in_the_same_order(project_names, '_id')
+ assert ids == sorted(ids, reverse=True)
+
+ @td.with_wiki
+ def test_sort_updated(self):
+ r = self.app.post('/p/wiki/Home/update',
+ params={
+ 'title': 'Home',
+ 'text': '[[projects sort=last_updated]]'
+ },
+ extra_environ=dict(username='root'), upload_files=[]).follow()
+ project_names = self.get_project_names(r)
+ updated_at = self.get_projects_property_in_the_same_order(project_names, 'last_updated')
+ assert updated_at == sorted(updated_at, reverse=True)
