Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata

Conflicts:
	mediagoblin/gmg_commands/__init__.py

1 files changed, 24 insertions, 0 deletions

diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py
index 86513c76..ca436c76 100644
--- a/mediagoblin/tests/test_modelmethods.py
+++ b/mediagoblin/tests/test_modelmethods.py
@@ -20,9 +20,11 @@
 from mediagoblin.db.base import Session
 from mediagoblin.db.models import MediaEntry, User, Privilege
 
+from mediagoblin.tests import MGClientTestCase
 from mediagoblin.tests.tools import fixture_add_user
 
 import mock
+import pytest
 
 
 class FakeUUID(object):
@@ -30,6 +32,8 @@ class FakeUUID(object):
 
 UUID_MOCK = mock.Mock(return_value=FakeUUID())
 
+REQUEST_CONTEXT = ['mediagoblin/root.html', 'request']
+
 
 class TestMediaEntrySlugs(object):
     def _setup(self):
@@ -204,3 +208,23 @@ def test_media_data_init(test_app):
         print repr(obj)
     assert obj_in_session == 0
 
+
+class TestUserUrlForSelf(MGClientTestCase):
+
+    usernames = [(u'lindsay', dict(privileges=[u'active']))]
+
+    def test_url_for_self(self):
+        _, request = self.do_get('/', *REQUEST_CONTEXT)
+
+        assert self.user(u'lindsay').url_for_self(request.urlgen) == '/u/lindsay/'
+
+    def test_url_for_self_not_callable(self):
+        _, request = self.do_get('/', *REQUEST_CONTEXT)
+
+        def fake_urlgen():
+            pass
+
+        with pytest.raises(TypeError) as excinfo:
+            self.user(u'lindsay').url_for_self(fake_urlgen())
+        assert excinfo.errisinstance(TypeError)
+        assert 'object is not callable' in str(excinfo)