Skip to content

Commit 5e47bee

Browse files
jessemcbridejessemcbride
authored
Merge branch 'develop' into issue/371-file-quota-info
2 parents 2f4b39b + 994e428 commit 5e47bee

File tree

3 files changed

+150
-15
lines changed

3 files changed

+150
-15
lines changed

‎canvasapi/favorite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ def remove(self, **kwargs):
1717
1818
:rtype: :class:`canvasapi.favorite.Favorite`
1919
"""
20-
if self.context_type == "course":
20+
if self.context_type.lower() == "course":
2121
id = self.context_id
2222
uri_str = "users/self/favorites/courses/{}"
2323

24-
elif self.context_type == "group":
24+
elif self.context_type.lower() == "group":
2525
id = self.context_id
2626
uri_str = "users/self/favorites/groups/{}"
2727

‎tests/fixtures/current_user.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
"context_type": "course"
99
},
1010
"status_code": 200
11+
},
12+
"add_favorite_course_cap_context_type": {
13+
"method": "POST",
14+
"endpoint": "users/self/favorites/courses/1",
15+
"data":
16+
{
17+
"context_id": 1,
18+
"context_type": "Course"
19+
},
20+
"status_code": 200
1121
},
1222
"add_favorite_course_by_sis_id": {
1323
"method": "POST",
@@ -28,6 +38,16 @@
2838
"context_type": "group"
2939
},
3040
"status_code": 200
41+
},
42+
"add_favorite_group_cap_context_type": {
43+
"method": "POST",
44+
"endpoint": "users/self/favorites/groups/1",
45+
"data":
46+
{
47+
"context_id": 1,
48+
"context_type": "Group"
49+
},
50+
"status_code": 200
3151
},
3252
"add_favorite_group_by_sis_id": {
3353
"method": "POST",
@@ -122,6 +142,16 @@
122142
"context_type": "course"
123143
},
124144
"status_code": 200
145+
},
146+
"remove_favorite_course_cap_context_type": {
147+
"method": "DELETE",
148+
"endpoint": "users/self/favorites/courses/1",
149+
"data":
150+
{
151+
"context_id": 1,
152+
"context_type": "Course"
153+
},
154+
"status_code": 200
125155
},
126156
"remove_favorite_group": {
127157
"method": "DELETE",
@@ -132,6 +162,16 @@
132162
"context_type": "group"
133163
},
134164
"status_code": 200
165+
},
166+
"remove_favorite_group_cap_context_type": {
167+
"method": "DELETE",
168+
"endpoint": "users/self/favorites/groups/1",
169+
"data":
170+
{
171+
"context_id": 1,
172+
"context_type": "Group"
173+
},
174+
"status_code": 200
135175
},
136176
"reset_favorite_courses": {
137177
"method": "DELETE",

‎tests/test_favorite.py‎

Lines changed: 108 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,133 @@ def setUp(self):
1616
with requests_mock.Mocker() as m:
1717
requires = {
1818
"current_user": [
19-
"add_favorite_course",
20-
"add_favorite_group",
2119
"get_by_id",
2220
]
2321
}
2422
register_uris(requires, m)
2523

2624
self.user = self.canvas.get_current_user()
27-
self.favorite_course = self.user.add_favorite_course(1)
28-
self.favorite_group = self.user.add_favorite_group(1)
2925

3026
# __str__()
31-
def test__str__(self, m):
32-
string = str(self.favorite_course)
27+
def test_uncapitalized___str__(self, m):
28+
29+
register_uris(
30+
{
31+
"current_user": [
32+
"add_favorite_course",
33+
"add_favorite_group",
34+
]
35+
},
36+
m,
37+
)
38+
39+
favorite_course = self.user.add_favorite_course(1)
40+
favorite_group = self.user.add_favorite_group(1)
41+
42+
string = str(favorite_course)
43+
self.assertIsInstance(string, str)
44+
45+
string = str(favorite_group)
46+
self.assertIsInstance(string, str)
47+
48+
def test_capitalized___str__(self, m):
49+
50+
register_uris(
51+
{
52+
"current_user": [
53+
"add_favorite_course_cap_context_type",
54+
"add_favorite_group_cap_context_type",
55+
]
56+
},
57+
m,
58+
)
59+
60+
favorite_course = self.user.add_favorite_course(1)
61+
favorite_group = self.user.add_favorite_group(1)
62+
63+
string = str(favorite_course)
3364
self.assertIsInstance(string, str)
3465

35-
string = str(self.favorite_group)
66+
string = str(favorite_group)
3667
self.assertIsInstance(string, str)
3768

3869
# remove()
39-
def test_remove_favorite_course(self, m):
40-
register_uris({"current_user": ["remove_favorite_course"]}, m)
70+
def test_remove_uncapitalized_favorite_course(self, m):
71+
72+
register_uris(
73+
{
74+
"current_user": [
75+
"add_favorite_course",
76+
"remove_favorite_course",
77+
]
78+
},
79+
m,
80+
)
81+
82+
favorite_course = self.user.add_favorite_course(1)
83+
84+
evnt = favorite_course.remove()
4185

42-
evnt = self.favorite_course.remove()
4386
self.assertIsInstance(evnt, Favorite)
4487
self.assertEqual(evnt.context_type, "course")
4588
self.assertEqual(evnt.context_id, 1)
4689

47-
def test_remove_favorite_group(self, m):
48-
register_uris({"current_user": ["remove_favorite_group"]}, m)
90+
def test_remove_uncapitalized_favorite_group(self, m):
91+
92+
register_uris(
93+
{
94+
"current_user": [
95+
"add_favorite_group",
96+
"remove_favorite_group",
97+
]
98+
},
99+
m,
100+
)
101+
102+
favorite_group = self.user.add_favorite_group(1)
103+
104+
evnt = favorite_group.remove()
49105

50-
evnt = self.favorite_group.remove()
51106
self.assertIsInstance(evnt, Favorite)
52107
self.assertEqual(evnt.context_type, "group")
53108
self.assertEqual(evnt.context_id, 1)
109+
110+
def test_remove_capitalized_favorite_course(self, m):
111+
112+
register_uris(
113+
{
114+
"current_user": [
115+
"add_favorite_course_cap_context_type",
116+
"remove_favorite_course_cap_context_type",
117+
]
118+
},
119+
m,
120+
)
121+
122+
favorite_course = self.user.add_favorite_course(1)
123+
124+
evnt = favorite_course.remove()
125+
126+
self.assertIsInstance(evnt, Favorite)
127+
self.assertEqual(evnt.context_type, "Course")
128+
self.assertEqual(evnt.context_id, 1)
129+
130+
def test_remove_capitalized_favorite_group(self, m):
131+
132+
register_uris(
133+
{
134+
"current_user": [
135+
"add_favorite_group_cap_context_type",
136+
"remove_favorite_group_cap_context_type",
137+
]
138+
},
139+
m,
140+
)
141+
142+
favorite_group = self.user.add_favorite_group(1)
143+
144+
evnt = favorite_group.remove()
145+
146+
self.assertIsInstance(evnt, Favorite)
147+
self.assertEqual(evnt.context_type, "Group")
148+
self.assertEqual(evnt.context_id, 1)

0 commit comments

Comments
 (0)