~rvb/maas/transaction-1.7-bug-1409852

« back to all changes in this revision

Viewing changes to src/maasserver/models/tests/test_user.py

merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright 2012, 2013 Canonical Ltd.  This software is licensed under the
 
1
# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
2
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3
3
 
4
4
"""Tests for :class:`User`-related helpers."""
46
46
        self.assertEqual('', consumer.secret)
47
47
 
48
48
    def test_create_auth_token(self):
49
 
        user = factory.make_user()
 
49
        user = factory.make_User()
50
50
        token = create_auth_token(user)
51
51
        self.assertEqual(user, token.user)
52
52
        self.assertEqual(user, token.consumer.user)
55
55
        self.assertTokenValid(token)
56
56
 
57
57
    def test_get_auth_tokens_finds_tokens_for_user(self):
58
 
        user = factory.make_user()
 
58
        user = factory.make_User()
59
59
        token = create_auth_token(user)
60
60
        self.assertIn(token, get_auth_tokens(user))
61
61
 
62
62
    def test_get_auth_tokens_ignores_other_users(self):
63
 
        user, other_user = factory.make_user(), factory.make_user()
 
63
        user, other_user = factory.make_User(), factory.make_User()
64
64
        unrelated_token = create_auth_token(other_user)
65
65
        self.assertNotIn(unrelated_token, get_auth_tokens(user))
66
66
 
67
67
    def test_get_auth_tokens_ignores_unapproved_tokens(self):
68
 
        user = factory.make_user()
 
68
        user = factory.make_User()
69
69
        token = create_auth_token(user)
70
70
        token.is_approved = False
71
71
        token.save()
72
72
        self.assertNotIn(token, get_auth_tokens(user))
73
73
 
74
74
    def test_get_creds_tuple_returns_creds(self):
75
 
        token = create_auth_token(factory.make_user())
 
75
        token = create_auth_token(factory.make_User())
76
76
        self.assertEqual(
77
77
            (token.consumer.key, token.key, token.secret),
78
78
            get_creds_tuple(token))
79
79
 
80
80
    def test_get_creds_tuple_integrates_with_api_client(self):
81
 
        creds_tuple = get_creds_tuple(create_auth_token(factory.make_user()))
 
81
        creds_tuple = get_creds_tuple(create_auth_token(factory.make_User()))
82
82
        self.assertEqual(
83
83
            creds_tuple,
84
84
            convert_string_to_tuple(convert_tuple_to_string(creds_tuple)))