Skip to content

Commit 340673f

Browse files
jereljerel
committed
Cleaned up tests from merges
1 parent 1c0cb72 commit 340673f

File tree

2 files changed

+71
-79
lines changed

2 files changed

+71
-79
lines changed

‎example/tests/test_model_viewsets.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ def test_key_in_list_result(self):
6262

6363
assert expected_dump == content_dump
6464

65-
# WHY zero?
66-
# self.assertEquals(meta.get('count', 0),
67-
# get_user_model().objects.count())
68-
6965
def test_page_two_in_list_result(self):
7066
"""
7167
Ensure that the second page is reachable and is the correct data.
@@ -157,10 +153,6 @@ def test_page_range_in_list_result(self):
157153

158154
assert expected_dump == content_dump
159155

160-
# WHY zero?
161-
# self.assertEquals(meta.get('count', 0),
162-
# get_user_model().objects.count())
163-
164156
def test_key_in_detail_result(self):
165157
"""
166158
Ensure the result has a 'user' key.

‎example/tests/test_multiple_id_mixin.py‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
1-
# import json
2-
# from example.tests import TestBase
3-
# from django.utils import encoding
4-
# from django.contrib.auth import get_user_model
5-
# from django.core.urlresolvers import reverse
6-
# from django.conf import settings
1+
import json
2+
from example.tests import TestBase
3+
from django.utils import encoding
4+
from django.contrib.auth import get_user_model
5+
from django.core.urlresolvers import reverse
6+
from django.conf import settings
77

88

9-
# class MultipleIDMixin(TestBase):
10-
# """
11-
# Test usage with MultipleIDMixin
9+
class MultipleIDMixin(TestBase):
10+
"""
11+
Test usage with MultipleIDMixin
1212
13-
# [<RegexURLPattern user-list ^user-viewsets/$>,
14-
# <RegexURLPattern user-detail ^user-viewsets/(?P<pk>[^/]+)/$>]
15-
# """
16-
# list_url = reverse('user-list')
13+
[<RegexURLPattern user-list ^user-viewsets/$>,
14+
<RegexURLPattern user-detail ^user-viewsets/(?P<pk>[^/]+)/$>]
15+
"""
16+
list_url = reverse('user-list')
1717

18-
# def test_single_id_in_query_params(self):
19-
# """
20-
# Ensure single ID in query params returns correct result
21-
# """
22-
# url = '/identities?ids[]={0}'.format(self.miles.pk)
23-
# response = self.client.get(url)
24-
# self.assertEqual(response.status_code, 200)
18+
def test_single_id_in_query_params(self):
19+
"""
20+
Ensure single ID in query params returns correct result
21+
"""
22+
url = '/identities?ids[]={0}'.format(self.miles.pk)
23+
response = self.client.get(url)
24+
self.assertEqual(response.status_code, 200)
2525

26-
# expected = {
27-
# 'data': {
28-
# 'type': 'users',
29-
# 'id': encoding.force_text(self.miles.pk),
30-
# 'attributes': {
31-
# 'first_name': self.miles.first_name,
32-
# 'last_name': self.miles.last_name,
33-
# 'email': self.miles.email
34-
# }
35-
# }
36-
# }
26+
expected = {
27+
'data': {
28+
'type': 'users',
29+
'id': encoding.force_text(self.miles.pk),
30+
'attributes': {
31+
'first_name': self.miles.first_name,
32+
'last_name': self.miles.last_name,
33+
'email': self.miles.email
34+
}
35+
}
36+
}
3737

38-
# json_content = json.loads(response.content.decode('utf8'))
39-
# links = json_content.get("links")
40-
# meta = json_content.get("meta").get('pagination')
38+
json_content = json.loads(response.content.decode('utf8'))
39+
links = json_content.get("links")
40+
meta = json_content.get("meta").get('pagination')
4141

42-
# self.assertEquals(expected.get('user'), json_content.get('user'))
43-
# self.assertEquals(meta.get('count', 0), 1)
44-
# self.assertEquals(links.get("next"), None)
45-
# self.assertEqual(meta.get("page"), 1)
42+
self.assertEquals(expected.get('user'), json_content.get('user'))
43+
self.assertEquals(meta.get('count', 0), 1)
44+
self.assertEquals(links.get("next"), None)
45+
self.assertEqual(meta.get("page"), 1)
4646

47-
# def test_multiple_ids_in_query_params(self):
48-
# """
49-
# Ensure multiple IDs in query params return correct result
50-
# """
51-
# url = '/identities?ids[]={0}&ids[]={1}'.format(
52-
# self.miles.pk, self.john.pk)
53-
# response = self.client.get(url)
54-
# self.assertEqual(response.status_code, 200)
47+
def test_multiple_ids_in_query_params(self):
48+
"""
49+
Ensure multiple IDs in query params return correct result
50+
"""
51+
url = '/identities?ids[]={0}&ids[]={1}'.format(
52+
self.miles.pk, self.john.pk)
53+
response = self.client.get(url)
54+
self.assertEqual(response.status_code, 200)
5555

56-
# expected = {
57-
# 'data': {
58-
# 'type': 'users',
59-
# 'id': encoding.force_text(self.john.pk),
60-
# 'attributes': {
61-
# 'first_name': self.john.first_name,
62-
# 'last_name': self.john.last_name,
63-
# 'email': self.john.email
64-
# }
65-
# }
66-
# }
56+
expected = {
57+
'data': {
58+
'type': 'users',
59+
'id': encoding.force_text(self.john.pk),
60+
'attributes': {
61+
'first_name': self.john.first_name,
62+
'last_name': self.john.last_name,
63+
'email': self.john.email
64+
}
65+
}
66+
}
6767

68-
# json_content = json.loads(response.content.decode('utf8'))
69-
# links = json_content.get("links")
70-
# meta = json_content.get("meta").get('pagination')
68+
json_content = json.loads(response.content.decode('utf8'))
69+
links = json_content.get("links")
70+
meta = json_content.get("meta").get('pagination')
7171

72-
# self.assertEquals(expected.get('user'), json_content.get('user'))
73-
# self.assertEquals(meta.get('count', 0), 2)
74-
# self.assertEqual(
75-
# sorted(
76-
# 'http://testserver/identities?ids%5B%5D=2&ids%5B%5D=1&page=2'\
77-
# .split('?')[1].split('&')
78-
# ),
79-
# sorted(
80-
# links.get("next").split('?')[1].split('&'))
81-
# )
82-
# self.assertEqual(meta.get("page"), 1)
72+
self.assertEquals(expected.get('user'), json_content.get('user'))
73+
self.assertEquals(meta.get('count', 0), 2)
74+
self.assertEqual(
75+
sorted(
76+
'http://testserver/identities?ids%5B%5D=2&ids%5B%5D=1&page=2'\
77+
.split('?')[1].split('&')
78+
),
79+
sorted(
80+
links.get("next").split('?')[1].split('&'))
81+
)
82+
self.assertEqual(meta.get("page"), 1)

0 commit comments

Comments
 (0)