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

« back to all changes in this revision

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

merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
87
87
            httplib.FORBIDDEN, response.status_code, response.content)
88
88
 
89
89
    def test_GET_lists_users(self):
90
 
        users = [factory.make_user() for counter in range(2)]
 
90
        users = [factory.make_User() for counter in range(2)]
91
91
 
92
92
        response = self.client.get(reverse('users_handler'))
93
93
        self.assertEqual(httplib.OK, response.status_code, response.content)
104
104
        # the two may use different collations.
105
105
        users = [factory.make_name('user').lower() for counter in range(5)]
106
106
        for user in users:
107
 
            factory.make_user(username=user)
 
107
            factory.make_User(username=user)
108
108
 
109
109
        response = self.client.get(reverse('users_handler'))
110
110
        self.assertEqual(httplib.OK, response.status_code, response.content)
126
126
            reverse('user_handler', args=['username']))
127
127
 
128
128
    def test_GET_finds_user(self):
129
 
        user = factory.make_user()
 
129
        user = factory.make_User()
130
130
 
131
131
        response = self.client.get(
132
132
            reverse('user_handler', args=[user.username]))
138
138
        self.assertFalse(returned_user['is_superuser'])
139
139
 
140
140
    def test_GET_shows_expected_fields(self):
141
 
        user = factory.make_user()
 
141
        user = factory.make_User()
142
142
 
143
143
        response = self.client.get(
144
144
            reverse('user_handler', args=[user.username]))