From 4e961850525d99ef13ff759eaaab5a710e37213e Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 04 2015 15:13:23 +0000
Subject: [PATCH 1/3] Users are not sorted by their name but make double-sure the order is consistent


---

diff --git a/tests/test_progit_flask_api.py b/tests/test_progit_flask_api.py
index b9e7763..c54817f 100644
--- a/tests/test_progit_flask_api.py
+++ b/tests/test_progit_flask_api.py
@@ -53,7 +53,7 @@ class PagureFlaskApitests(tests.Modeltests):
         output = self.app.get('/api/0/users')
         self.assertEqual(output.status_code, 200)
         data = json.loads(output.data)
-        self.assertEqual(data['users'], ['pingou', 'foo'])
+        self.assertEqual(sorted(data['users']), ['foo', 'pingou'])
         self.assertEqual(data.keys(), ['users'])
 
         output = self.app.get('/api/0/users?pattern=p')

From f8911ef000b55e6d2e7d2b82db09c00bbb6971f0 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 04 2015 15:13:42 +0000
Subject: [PATCH 2/3] After creating an issue, users is brought back to the new issue page


Relates to http://dev.pagure.org/pagure/issue/110

---

diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py
index df6d35d..6bbbf08 100644
--- a/tests/test_progit_flask_ui_issues.py
+++ b/tests/test_progit_flask_ui_issues.py
@@ -120,7 +120,9 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertTrue(
                 '<p>test project<a href="/test/issue/1"> #1</a></p>'
                 in output.data)
-            self.assertTrue('<h2>\n    Issues (1)\n  </h2>' in output.data)
+            self.assertTrue(
+                '<p>test project<a href="/test/issue/1"> #1</a></p>'
+                in output.data)
 
         # Project w/o issue tracker
         repo = pagure.lib.get_project(self.session, 'test')
@@ -176,7 +178,9 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertTrue(
                 '<p>test project<a href="/test/issue/1"> #1</a></p>'
                 in output.data)
-            self.assertTrue('<h2>\n    Issues (1)\n  </h2>' in output.data)
+            self.assertTrue(
+                '<p>test project<a href="/test/issue/1"> #1</a></p>'
+                in output.data)
 
         # Project w/o issue tracker
         repo = pagure.lib.get_project(self.session, 'test')

From c1b058b546bb6593c60b6493938dc0ebeece5ae7 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 04 2015 15:14:16 +0000
Subject: [PATCH 3/3] Users are now ordered by their username by default


---

diff --git a/tests/test_progit_lib.py b/tests/test_progit_lib.py
index b3cdffd..a66b927 100644
--- a/tests/test_progit_lib.py
+++ b/tests/test_progit_lib.py
@@ -40,13 +40,13 @@ class PagureLibtests(tests.Modeltests):
         # Retrieve all users
         items = pagure.lib.search_user(self.session)
         self.assertEqual(2, len(items))
-        self.assertEqual(1, items[0].id)
-        self.assertEqual('pingou', items[0].user)
-        self.assertEqual('pingou', items[0].username)
-        self.assertEqual([], items[0].groups)
-        self.assertEqual(2, items[1].id)
-        self.assertEqual('foo', items[1].user)
-        self.assertEqual('foo', items[1].username)
+        self.assertEqual(2, items[0].id)
+        self.assertEqual('foo', items[0].user)
+        self.assertEqual('foo', items[0].username)
+        self.assertEqual([], items[1].groups)
+        self.assertEqual(1, items[1].id)
+        self.assertEqual('pingou', items[1].user)
+        self.assertEqual('pingou', items[1].username)
         self.assertEqual([], items[1].groups)
 
     def test_search_user_username(self):
@@ -985,10 +985,10 @@ class PagureLibtests(tests.Modeltests):
 
         items = pagure.lib.search_user(self.session)
         self.assertEqual(2, len(items))
-        self.assertEqual(1, items[0].id)
-        self.assertEqual('pingou', items[0].user)
-        self.assertEqual(2, items[1].id)
-        self.assertEqual('foo', items[1].user)
+        self.assertEqual(2, items[0].id)
+        self.assertEqual('foo', items[0].user)
+        self.assertEqual(1, items[1].id)
+        self.assertEqual('pingou', items[1].user)
 
         pagure.lib.set_up_user(
             session=self.session,
@@ -1000,10 +1000,10 @@ class PagureLibtests(tests.Modeltests):
 
         items = pagure.lib.search_user(self.session)
         self.assertEqual(3, len(items))
-        self.assertEqual(1, items[0].id)
-        self.assertEqual('pingou', items[0].user)
-        self.assertEqual(2, items[1].id)
-        self.assertEqual('foo', items[1].user)
+        self.assertEqual(2, items[0].id)
+        self.assertEqual('foo', items[0].user)
+        self.assertEqual(1, items[1].id)
+        self.assertEqual('pingou', items[1].user)
         self.assertEqual(3, items[2].id)
         self.assertEqual('skvidal', items[2].user)
         self.assertEqual('Seth', items[2].fullname)