Skip to content

Commit 0ba5407

Browse files
renzonrenzon
authored andcommitted
Grant access to Entrevistas Técnicas to Webdev role
close #3033
1 parent c58e816 commit 0ba5407

File tree

4 files changed

+60
-59
lines changed

4 files changed

+60
-59
lines changed

pythonpro/modules/permissions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
_LEAD_MODULES = {'python-birds'}
1313
_CLIENT_MODULES = {'python-birds', 'pytools'}
14-
_WEBDEV_MODULES = {'python-birds', 'pytools', 'django'}
14+
_WEBDEV_MODULES = {'python-birds', 'pytools', 'django', 'entrevistas-tecnicas'}
1515
_BOOTCAMPER_MODULES = {'python-birds', 'pytools', 'django', 'entrevistas-tecnicas'}
1616
_PYTHONISTA_MODULES = {'python-birds', 'objetos-pythonicos', 'python-para-pythonistas', 'python-patterns'}
1717

pythonpro/modules/tests/test_module_index_view_roles_access.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def test_module_client_user_can_not_access(modules_dct, resp_client_user, slug):
9393
'python-birds',
9494
'pytools',
9595
'django',
96+
'entrevistas-tecnicas',
9697
])
9798
def test_module_webdev_user_can_access(modules_dct, resp_webdev_user, slug):
9899
""" Assert that user with a webdev role can access the right content """
@@ -103,7 +104,6 @@ def test_module_webdev_user_can_access(modules_dct, resp_webdev_user, slug):
103104
'objetos-pythonicos',
104105
'python-para-pythonistas',
105106
'python-patterns',
106-
'entrevistas-tecnicas',
107107
])
108108
def test_module_webdev_user_can_not_access(modules_dct, resp_webdev_user, slug):
109109
""" Assert that user with a webdev role can not access some contents """

pythonpro/modules/tests/test_topics_view.py

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -214,31 +214,32 @@ def test_level_one_user_acces_level_one_content(resp_level_one_user_accesing_lev
214214
dj_assert_template_used(resp_level_one_user_accesing_level_one_content, 'topics/topic_detail.html')
215215

216216

217-
@pytest.fixture
218-
def module_webdev(db):
219-
return baker.make(Module, slug='django')
217+
@pytest.fixture(params='django entrevistas-tecnicas'.split())
218+
def module_level_two(db, request):
219+
slug = request.param
220+
return baker.make(Module, slug=slug)
220221

221222

222223
@pytest.fixture
223-
def section_webdev(module_webdev):
224-
return baker.make(Section, module=module_webdev)
224+
def section_level_two(module_level_two):
225+
return baker.make(Section, module=module_level_two)
225226

226227

227228
@pytest.fixture
228-
def chapter_webdev(section_webdev):
229-
return baker.make(Chapter, section=section_webdev)
229+
def chapter_level_two(section_level_two):
230+
return baker.make(Chapter, section=section_level_two)
230231

231232

232233
@pytest.fixture
233-
def topic_webdev(chapter_webdev):
234-
return baker.make(Topic, chapter=chapter_webdev)
234+
def topic_level_two(chapter_level_two):
235+
return baker.make(Topic, chapter=chapter_level_two)
235236

236237

237238
@pytest.fixture
238-
def resp_not_level_two_accesing_level_two_content(client_with_not_level_two_roles, topic_webdev):
239+
def resp_not_level_two_accesing_level_two_content(client_with_not_level_two_roles, topic_level_two):
239240
return client_with_not_level_two_roles.get(
240241
reverse('modules:topic_detail',
241-
kwargs={'module_slug': topic_webdev.module_slug(), 'topic_slug': topic_webdev.slug}),
242+
kwargs={'module_slug': topic_level_two.module_slug(), 'topic_slug': topic_level_two.slug}),
242243
)
243244

244245

@@ -248,57 +249,57 @@ def test_not_level_two_hitting_webdev_landing_page_oto(resp_not_level_two_accesi
248249

249250

250251
@pytest.fixture
251-
def resp_level_two_accessing_webdev_content(client_with_level_two_roles, topic_webdev):
252+
def resp_level_two_accessing_webdev_content(client_with_level_two_roles, topic_level_two):
252253
return client_with_level_two_roles.get(
253254
reverse('modules:topic_detail',
254-
kwargs={'module_slug': topic_webdev.module_slug(), 'topic_slug': topic_webdev.slug}),
255+
kwargs={'module_slug': topic_level_two.module_slug(), 'topic_slug': topic_level_two.slug}),
255256
secure=True)
256257

257258

258259
def test_webdev_access_webdev_content(resp_level_two_accessing_webdev_content):
259260
dj_assert_template_used(resp_level_two_accessing_webdev_content, 'topics/topic_detail.html')
260261

261262

262-
@pytest.fixture
263-
def module_level_three(db):
264-
return baker.make(Module, slug='entrevistas-tecnicas')
265-
266-
267-
@pytest.fixture
268-
def section_level_three(module_level_three):
269-
return baker.make(Section, module=module_level_three)
270-
271-
272-
@pytest.fixture
273-
def chapter_level_three(section_level_three):
274-
return baker.make(Chapter, section=section_level_three)
275-
276-
277-
@pytest.fixture
278-
def topic_level_three(chapter_level_three):
279-
return baker.make(Topic, chapter=chapter_level_three)
280-
281-
282-
@pytest.fixture
283-
def resp_not_level_three_accesing_level_three_content(client_with_not_level_three_roles, topic_level_three):
284-
return client_with_not_level_three_roles.get(
285-
reverse('modules:topic_detail',
286-
kwargs={'module_slug': topic_level_three.module_slug(), 'topic_slug': topic_level_three.slug}),
287-
)
288-
289-
290-
def test_not_level_three_hitting_level_three_landing_page(resp_not_level_three_accesing_level_three_content):
291-
assert resp_not_level_three_accesing_level_three_content.status_code == 302
292-
assert resp_not_level_three_accesing_level_three_content.url == reverse('checkout:bootcamp_lp')
293-
294-
295-
@pytest.fixture
296-
def resp_level_three_accessing_level_three_content(client_with_level_three_roles, topic_level_three):
297-
return client_with_level_three_roles.get(
298-
reverse('modules:topic_detail',
299-
kwargs={'module_slug': topic_level_three.module_slug(), 'topic_slug': topic_level_three.slug}),
300-
secure=True)
301-
302-
303-
def test_level_three_access_level_three_content(resp_level_three_accessing_level_three_content):
304-
dj_assert_template_used(resp_level_three_accessing_level_three_content, 'topics/topic_detail.html')
263+
# @pytest.fixture
264+
# def module_level_three(db):
265+
# return baker.make(Module, slug='entrevistas-tecnicas')
266+
#
267+
#
268+
# @pytest.fixture
269+
# def section_level_three(module_level_three):
270+
# return baker.make(Section, module=module_level_three)
271+
#
272+
#
273+
# @pytest.fixture
274+
# def chapter_level_three(section_level_three):
275+
# return baker.make(Chapter, section=section_level_three)
276+
#
277+
#
278+
# @pytest.fixture
279+
# def topic_level_three(chapter_level_three):
280+
# return baker.make(Topic, chapter=chapter_level_three)
281+
#
282+
#
283+
# @pytest.fixture
284+
# def resp_not_level_three_accesing_level_three_content(client_with_not_level_three_roles, topic_level_three):
285+
# return client_with_not_level_three_roles.get(
286+
# reverse('modules:topic_detail',
287+
# kwargs={'module_slug': topic_level_three.module_slug(), 'topic_slug': topic_level_three.slug}),
288+
# )
289+
#
290+
#
291+
# def test_not_level_three_hitting_level_three_landing_page(resp_not_level_three_accesing_level_three_content):
292+
# assert resp_not_level_three_accesing_level_three_content.status_code == 302
293+
# assert resp_not_level_three_accesing_level_three_content.url == reverse('checkout:bootcamp_lp')
294+
295+
296+
# @pytest.fixture
297+
# def resp_level_three_accessing_level_three_content(client_with_level_three_roles, topic_level_three):
298+
# return client_with_level_three_roles.get(
299+
# reverse('modules:topic_detail',
300+
# kwargs={'module_slug': topic_level_three.module_slug(), 'topic_slug': topic_level_three.slug}),
301+
# secure=True)
302+
#
303+
#
304+
# def test_level_three_access_level_three_content(resp_level_three_accessing_level_three_content):
305+
# dj_assert_template_used(resp_level_three_accessing_level_three_content, 'topics/topic_detail.html')

pythonpro/modules/topics_views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
def content_landing_page(content: Content):
11-
if content.module_slug() in {'pytools', 'django'}:
11+
if content.module_slug() in {'pytools', 'django', 'entrevistas-tecnicas'}:
1212
redirect_path = reverse('checkout:webdev_landing_page')
1313
else:
1414
redirect_path = reverse('checkout:bootcamp_lp')

0 commit comments

Comments
 (0)