+ Congratulations, you've reached the end of this unit!
+ Help future students by selecting the skills or subjects you learned from this unit.
+
Some
") + + @override_settings( + SHOW_SKILL_VERIFICATION_PROBABILITY=0, + ) + def test_pipeline_does_nothing_when_probability_set_to_zero(self, mock_get_api_client): + """ + Check that the input fragment is unchanged when there is no + configuration for a course. + """ + mock_get_api_client.return_value = self.get_mock_api_response() + _, fragment, _, _ = VerticalBlockRenderCompleted.run_filter( + block=self.block, context={}, fragment=self.original_fragement, view={} + ) + self.assertEqual(fragment.content, self.original_fragement.content) + self.assertNotIn("SKILL-0", fragment.content) + + @override_settings( + SHOW_SKILL_VERIFICATION_PROBABILITY=1, + ) + def test_pipeline_adds_edit_link_when_probability_set_to_one(self, mock_get_api_client): + """Check that verification div is added with skills.""" + mock_get_api_client.return_value = self.get_mock_api_response() + _, fragment, _, _ = VerticalBlockRenderCompleted.run_filter( + block=self.block, context={}, fragment=self.original_fragement, view={} + ) + + self.assertIn(self.original_fragement.content, fragment.content) + self.assertIn("SKILL-0", fragment.content) + self.assertIn("SKILL-5", fragment.content) diff --git a/tests/test_skill_tagging_mixin.py b/tests/test_skill_tagging_mixin.py index dcd7af9..0fbab09 100644 --- a/tests/test_skill_tagging_mixin.py +++ b/tests/test_skill_tagging_mixin.py @@ -3,83 +3,34 @@ """ from __future__ import absolute_import -import json import unittest from unittest.mock import Mock, patch -from requests.models import Response -from rest_framework import status - -from .utils import TestCaseMixin, get_tagging_mixin, make_block +from test_utils import TestCaseMixin, get_tagging_mixin @patch('skill_tagging.skill_tagging_mixin.get_api_client') -class SkillTaggingMixinTests(unittest.TestCase, TestCaseMixin): +class SkillTaggingMixinTests(TestCaseMixin, unittest.TestCase): """ Test suite for SkillTaggingMixin """ - def setUp(self): - self.block = make_block() - self.patch_workbench() - fake_user = Mock() - fake_user.opt_attrs = { - 'edx-platform.user_role': 'student', - 'edx-platform.is_authenticated': True, - } - mock_user_service = Mock() - mock_user_service.get_current_user.return_value = fake_user - self.block.runtime.service = Mock(return_value=mock_user_service) - - def _mock_response(self, status_code, content=None): - """ - Generates a python core response. - """ - mock_response = Response() - mock_response.status_code = status_code - # pylint: disable=protected-access - mock_response._content = json.dumps(content).encode('utf-8') - return mock_response - - # pylint: disable=unused-argument - def test_mixin_fields(self, mock_get_api_client): + def test_mixin_fields(self, _): """ Test for mixin field and methods """ self.tagging_mixin = get_tagging_mixin() self.assertTrue(hasattr(self.tagging_mixin, 'has_verified_tags')) - self.assertTrue(hasattr(self.tagging_mixin, 'fetch_tags')) + self.assertTrue(hasattr(self.tagging_mixin, 'fetch_skill_tags')) self.assertTrue(hasattr(self.tagging_mixin, 'verify_tags')) def test_fetch_tags(self, mock_get_api_client): """ Test that fetch_tags method works as expected """ - sample_output = { - "results": [{ - "id": 1, - "skills": [ - { - "id": 1, - "name": "SKILL-0" - }, - { - "id": 6, - "name": "SKILL-5" - }, - ], - }] - } - api_client = Mock( - get=Mock( - return_value=self._mock_response( - status.HTTP_200_OK, - sample_output - ) - ) - ) + api_client = self.get_mock_api_response() mock_get_api_client.return_value = api_client - resp = self.call_handler(self.FETCH_TAGS_HANDLER, data={}) + resp = self.block.fetch_skill_tags() assert mock_get_api_client.call_count == 1 assert api_client.get.call_count == 1 expected_response = [ @@ -89,39 +40,17 @@ def test_fetch_tags(self, mock_get_api_client): self.assertEqual(resp, expected_response) @patch('skill_tagging.skill_tagging_mixin.XBLOCK_SKILL_VERIFIED') - def test_verify_tags(self, mock_event, mock_get_api_client): + def test_verify_tags(self, mock_event, _): """ Test that verify_tags method works as expected """ - sample_output = { - "results": [{ - "id": 1, - "skills": [ - { - "id": 1, - "name": "SKILL-0" - }, - { - "id": 6, - "name": "SKILL-5" - }, - ], - }] - } - api_client = Mock( - get=Mock( - return_value=self._mock_response( - status.HTTP_200_OK, - sample_output - ) - ) - ) - mock_get_api_client.return_value = api_client mock_event.return_value = Mock(send_event=Mock()) - tags = ['SKILL-0', 'SKILL-5'] + selected_tags = [1, 6] + ignored_tags = [] self.assertFalse(self.block.has_verified_tags) - self.call_handler(self.VERIFY_TAGS_HANDLER, data=tags) - assert mock_get_api_client.call_count == 1 - assert api_client.get.call_count == 1 + self.call_handler(self.VERIFY_TAGS_HANDLER, data={ + "verified_skills": selected_tags, + "ignored_skills": ignored_tags, + }) assert mock_event.send_event.call_count == 1 self.assertTrue(self.block.has_verified_tags) diff --git a/tox.ini b/tox.ini index 3a1af48..ce71be9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,26 +1,48 @@ [tox] envlist = py38-django{32,40}, quality +[pycodestyle] +exclude = .git,.tox,migrations +max-line-length = 120 + +[isort] +line_length = 120 +known_edx = +known_django = django +known_djangoapp = model_utils +known_first_party = taxonomy +include_trailing_comma = true +multi_line_output = 3 +sections = FUTURE,STDLIB,THIRDPARTY,DJANGO,DJANGOAPP,EDX,FIRSTPARTY,LOCALFOLDER + +[pytest] +DJANGO_SETTINGS_MODULE = test_settings +addopts = --cov skill_tagging --cov-report term-missing --cov-report xml +norecursedirs = .* docs requirements site-packages + [testenv] -whitelist_externals = +whitelist_externals = make -deps = +deps = django32: Django>=3.2,<4.0 django40: Django>=4.0,<4.1 -r{toxinidir}/requirements/test.txt -commands = +commands = make test [testenv:quality] -whitelist_externals = +whitelist_externals = make rm touch -deps = + pylint + pycodestyle + isort +deps = -r{toxinidir}/requirements/quality.txt -commands = +commands = touch tests/__init__.py pylint skill_tagging tests rm tests/__init__.py