From f3a4534f1b175be7f17ab82391a3b54a410fd080 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:06:48 +0000 Subject: [PATCH 1/2] build(pre-commit): pre-commit autoupdate by ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.9 → v0.7.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.6.9...v0.7.2) - [github.com/pre-commit/mirrors-eslint: v9.12.0 → v9.14.0](https://github.com/pre-commit/mirrors-eslint/compare/v9.12.0...v9.14.0) - [github.com/crate-ci/typos: v1.26.0 → v1.27.0](https://github.com/crate-ci/typos/compare/v1.26.0...v1.27.0) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4010ed548..6e57cc161 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,12 +22,12 @@ repos: exclude: \.dot$ - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.9 + rev: v0.7.2 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/pre-commit/mirrors-eslint - rev: v9.12.0 + rev: v9.14.0 hooks: - id: eslint args: [--fix, --color] @@ -36,7 +36,7 @@ repos: - eslint-plugin-react@7.37.0 - react@18.3.1 - repo: https://github.com/crate-ci/typos - rev: v1.26.0 + rev: v1.27.0 hooks: - id: typos exclude: | From e5fc8a0bdcc2f4bd7ffacdec60adfdb72cb6dca8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:07:17 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- rdmo/conditions/tests/test_validator_locked.py | 4 ++-- rdmo/conditions/tests/test_validator_unique_uri.py | 6 +++--- rdmo/domain/tests/test_validator_locked.py | 4 ++-- rdmo/domain/tests/test_validator_parent.py | 4 ++-- rdmo/domain/tests/test_validator_unique_uri.py | 6 +++--- rdmo/options/tests/test_validator_locked_options.py | 4 ++-- rdmo/options/tests/test_validator_locked_optionsets.py | 4 ++-- .../options/tests/test_validator_unique_uri_options.py | 6 +++--- .../tests/test_validator_unique_uri_optionsets.py | 6 +++--- rdmo/projects/tests/test_validator_conflict.py | 10 +++++----- rdmo/projects/tests/test_validator_quota.py | 4 ++-- rdmo/projects/tests/test_validator_value_type.py | 4 ++-- rdmo/questions/tests/test_validator_locked_catalogs.py | 4 ++-- rdmo/questions/tests/test_validator_locked_pages.py | 4 ++-- .../questions/tests/test_validator_locked_questions.py | 4 ++-- .../tests/test_validator_locked_questionsets.py | 4 ++-- rdmo/questions/tests/test_validator_locked_sections.py | 4 ++-- .../tests/test_validator_unique_uri_catalogs.py | 6 +++--- .../questions/tests/test_validator_unique_uri_pages.py | 6 +++--- .../tests/test_validator_unique_uri_questions.py | 6 +++--- .../tests/test_validator_unique_uri_questionsets.py | 6 +++--- .../tests/test_validator_unique_uri_sections.py | 6 +++--- rdmo/tasks/tests/test_validator_locked.py | 4 ++-- rdmo/tasks/tests/test_validator_unique_uri.py | 6 +++--- rdmo/views/tests/test_validator_locked.py | 4 ++-- rdmo/views/tests/test_validator_unique_uri.py | 6 +++--- 26 files changed, 66 insertions(+), 66 deletions(-) diff --git a/rdmo/conditions/tests/test_validator_locked.py b/rdmo/conditions/tests/test_validator_locked.py index f35cfe897..e1e257bbb 100644 --- a/rdmo/conditions/tests/test_validator_locked.py +++ b/rdmo/conditions/tests/test_validator_locked.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Condition from ..serializers.v1 import ConditionSerializer @@ -93,7 +93,7 @@ def test_serializer_update_error(db): validator = ConditionLockedValidator() serializer = ConditionSerializer(instance=condition) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/conditions/tests/test_validator_unique_uri.py b/rdmo/conditions/tests/test_validator_unique_uri.py index a0b203f16..e809939c7 100644 --- a/rdmo/conditions/tests/test_validator_unique_uri.py +++ b/rdmo/conditions/tests/test_validator_unique_uri.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Condition from ..serializers.v1 import ConditionSerializer @@ -58,7 +58,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = ConditionUniqueURIValidator() serializer = ConditionSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': Condition.objects.filter(uri_prefix=settings.DEFAULT_URI_PREFIX).last().uri_path @@ -83,7 +83,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = ConditionUniqueURIValidator() serializer = ConditionSerializer(instance=condition) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': condition.uri_prefix, 'uri_path': Condition.objects.filter(uri_prefix=settings.DEFAULT_URI_PREFIX).last().uri_path diff --git a/rdmo/domain/tests/test_validator_locked.py b/rdmo/domain/tests/test_validator_locked.py index b3f5f3524..bc92b3524 100644 --- a/rdmo/domain/tests/test_validator_locked.py +++ b/rdmo/domain/tests/test_validator_locked.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Attribute from ..serializers.v1 import AttributeSerializer @@ -149,7 +149,7 @@ def test_serializer_update_error(db): validator = AttributeLockedValidator() serializer = AttributeSerializer(instance=attribute) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/domain/tests/test_validator_parent.py b/rdmo/domain/tests/test_validator_parent.py index 30baee9db..9e943ae17 100644 --- a/rdmo/domain/tests/test_validator_parent.py +++ b/rdmo/domain/tests/test_validator_parent.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Attribute from ..serializers.v1 import AttributeSerializer @@ -69,7 +69,7 @@ def test_serializer_update_error(db): validator = AttributeParentValidator() serializer = AttributeSerializer(instance=attribute) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': attribute.uri_prefix, 'key': attribute.key, diff --git a/rdmo/domain/tests/test_validator_unique_uri.py b/rdmo/domain/tests/test_validator_unique_uri.py index a92f3c2fe..1d90b2d94 100644 --- a/rdmo/domain/tests/test_validator_unique_uri.py +++ b/rdmo/domain/tests/test_validator_unique_uri.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Attribute from ..serializers.v1 import AttributeSerializer @@ -62,7 +62,7 @@ def test_validator_serializer_create_error(db): validator = AttributeUniqueURIValidator() serializer = AttributeSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'key': 'text', @@ -87,7 +87,7 @@ def test_validator_serializer_update_error(db): validator = AttributeUniqueURIValidator() serializer = AttributeSerializer(instance=attribute) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': attribute.uri_prefix, 'key': 'textarea', diff --git a/rdmo/options/tests/test_validator_locked_options.py b/rdmo/options/tests/test_validator_locked_options.py index 4af2ecacb..9eedea8c2 100644 --- a/rdmo/options/tests/test_validator_locked_options.py +++ b/rdmo/options/tests/test_validator_locked_options.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Option, OptionSet from ..serializers.v1 import OptionSerializer @@ -141,7 +141,7 @@ def test_serializer_update_error(db): validator = OptionLockedValidator() serializer = OptionSerializer(instance=option) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/options/tests/test_validator_locked_optionsets.py b/rdmo/options/tests/test_validator_locked_optionsets.py index 511b2b733..63d3fdadf 100644 --- a/rdmo/options/tests/test_validator_locked_optionsets.py +++ b/rdmo/options/tests/test_validator_locked_optionsets.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import OptionSet from ..serializers.v1 import OptionSetSerializer @@ -95,7 +95,7 @@ def test_serializer_update_error(db): validator = OptionSetLockedValidator() serializer = OptionSetSerializer(instance=optionset) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/options/tests/test_validator_unique_uri_options.py b/rdmo/options/tests/test_validator_unique_uri_options.py index b29ec193c..1ce112233 100644 --- a/rdmo/options/tests/test_validator_unique_uri_options.py +++ b/rdmo/options/tests/test_validator_unique_uri_options.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Option, OptionSet from ..serializers.v1 import OptionSerializer @@ -76,7 +76,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = OptionUniqueURIValidator() serializer = OptionSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': Option.objects.first().uri_path @@ -101,7 +101,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = OptionUniqueURIValidator() serializer = OptionSerializer(instance=instance) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': instance.uri_prefix, 'uri_path': Option.objects.exclude(id=instance.id).first().uri_path diff --git a/rdmo/options/tests/test_validator_unique_uri_optionsets.py b/rdmo/options/tests/test_validator_unique_uri_optionsets.py index bf7706809..3b161f709 100644 --- a/rdmo/options/tests/test_validator_unique_uri_optionsets.py +++ b/rdmo/options/tests/test_validator_unique_uri_optionsets.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Option, OptionSet from ..serializers.v1 import OptionSetSerializer @@ -76,7 +76,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = OptionSetUniqueURIValidator() serializer = OptionSetSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': OptionSet.objects.first().uri_path @@ -101,7 +101,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = OptionSetUniqueURIValidator() serializer = OptionSetSerializer(instance=instance) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': instance.uri_prefix, 'uri_path': OptionSet.objects.exclude(id=instance.id).first().uri_path diff --git a/rdmo/projects/tests/test_validator_conflict.py b/rdmo/projects/tests/test_validator_conflict.py index c6b97761b..43c8d0fd1 100644 --- a/rdmo/projects/tests/test_validator_conflict.py +++ b/rdmo/projects/tests/test_validator_conflict.py @@ -2,7 +2,7 @@ import pytest -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Project, Value from ..serializers.v1 import ValueSerializer @@ -48,7 +48,7 @@ class MockedView: serializer = ValueSerializer() serializer.context['view'] = MockedView() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'attribute': value.attribute, 'set_prefix': value.set_prefix, @@ -99,7 +99,7 @@ class MockedView: serializer.instance = value serializer.context['view'] = MockedView() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'attribute': value.attribute, 'set_prefix': value.set_prefix, @@ -188,7 +188,7 @@ class MockedView: serializer = ValueSerializer() serializer.context['view'] = MockedView() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'attribute': value.attribute, 'set_prefix': value.set_prefix, @@ -219,7 +219,7 @@ class MockedView: serializer = ValueSerializer() serializer.context['view'] = MockedView() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'attribute': value.attribute, 'set_prefix': value.set_prefix, diff --git a/rdmo/projects/tests/test_validator_quota.py b/rdmo/projects/tests/test_validator_quota.py index 4eee080e2..9f4a8933f 100644 --- a/rdmo/projects/tests/test_validator_quota.py +++ b/rdmo/projects/tests/test_validator_quota.py @@ -1,6 +1,6 @@ import pytest -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..serializers.v1 import ValueSerializer from ..validators import ValueQuotaValidator @@ -42,7 +42,7 @@ class MockedView: serializer = ValueSerializer() serializer.context['view'] = MockedView() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'value_type': 'file' }, serializer) diff --git a/rdmo/projects/tests/test_validator_value_type.py b/rdmo/projects/tests/test_validator_value_type.py index 88bf0a46e..18228fd79 100644 --- a/rdmo/projects/tests/test_validator_value_type.py +++ b/rdmo/projects/tests/test_validator_value_type.py @@ -1,6 +1,6 @@ import pytest -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..validators import ValueTypeValidator @@ -109,5 +109,5 @@ def test_serializer(db, value_type, text): @pytest.mark.parametrize('value_type,text', data_error) def test_serializer_error(db, value_type, text): validator = ValueTypeValidator() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({'value_type': value_type, 'text': text}) diff --git a/rdmo/questions/tests/test_validator_locked_catalogs.py b/rdmo/questions/tests/test_validator_locked_catalogs.py index 3951e32e8..eb5127fa5 100644 --- a/rdmo/questions/tests/test_validator_locked_catalogs.py +++ b/rdmo/questions/tests/test_validator_locked_catalogs.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Catalog from ..serializers.v1 import CatalogSerializer @@ -93,7 +93,7 @@ def test_serializer_update_error(db): validator = CatalogLockedValidator() serializer = CatalogSerializer(instance=catalog) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/questions/tests/test_validator_locked_pages.py b/rdmo/questions/tests/test_validator_locked_pages.py index 9ebc011e5..d603a69f8 100644 --- a/rdmo/questions/tests/test_validator_locked_pages.py +++ b/rdmo/questions/tests/test_validator_locked_pages.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Page, Section from ..serializers.v1 import PageSerializer @@ -191,7 +191,7 @@ def test_serializer_update_error(db): validator = PageLockedValidator() serializer = PageSerializer(instance=page) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/questions/tests/test_validator_locked_questions.py b/rdmo/questions/tests/test_validator_locked_questions.py index 5b82e1335..680b3f425 100644 --- a/rdmo/questions/tests/test_validator_locked_questions.py +++ b/rdmo/questions/tests/test_validator_locked_questions.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Page, Question, QuestionSet from ..serializers.v1 import QuestionSerializer @@ -433,7 +433,7 @@ def test_serializer_update_error(db): validator = QuestionLockedValidator() serializer = QuestionSerializer(instance=question) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/questions/tests/test_validator_locked_questionsets.py b/rdmo/questions/tests/test_validator_locked_questionsets.py index d4e5f6fc5..a9cffd250 100644 --- a/rdmo/questions/tests/test_validator_locked_questionsets.py +++ b/rdmo/questions/tests/test_validator_locked_questionsets.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Page, QuestionSet from ..serializers.v1 import QuestionSetSerializer @@ -391,7 +391,7 @@ def test_serializer_update_error(db): validator = QuestionSetLockedValidator() serializer = QuestionSetSerializer(instance=instance) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/questions/tests/test_validator_locked_sections.py b/rdmo/questions/tests/test_validator_locked_sections.py index 80f50bbcd..b14bd3f38 100644 --- a/rdmo/questions/tests/test_validator_locked_sections.py +++ b/rdmo/questions/tests/test_validator_locked_sections.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Catalog, Section from ..serializers.v1 import SectionSerializer @@ -151,7 +151,7 @@ def test_serializer_update_error(db): validator = SectionLockedValidator() serializer = SectionSerializer(instance=section) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/questions/tests/test_validator_unique_uri_catalogs.py b/rdmo/questions/tests/test_validator_unique_uri_catalogs.py index 5e418d47d..1275ed9ee 100644 --- a/rdmo/questions/tests/test_validator_unique_uri_catalogs.py +++ b/rdmo/questions/tests/test_validator_unique_uri_catalogs.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Catalog, Page, Question, QuestionSet, Section from ..serializers.v1 import SectionSerializer @@ -130,7 +130,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = CatalogUniqueURIValidator() serializer = SectionSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': Section.objects.first().uri_path @@ -155,7 +155,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = CatalogUniqueURIValidator() serializer = SectionSerializer(instance=instance) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': instance.uri_prefix, 'uri_path': Section.objects.exclude(id=instance.id).first().uri_path diff --git a/rdmo/questions/tests/test_validator_unique_uri_pages.py b/rdmo/questions/tests/test_validator_unique_uri_pages.py index a2878451e..5e98fa95b 100644 --- a/rdmo/questions/tests/test_validator_unique_uri_pages.py +++ b/rdmo/questions/tests/test_validator_unique_uri_pages.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Catalog, Page, Question, QuestionSet, Section from ..serializers.v1 import PageSerializer @@ -130,7 +130,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = PageUniqueURIValidator() serializer = PageSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': Page.objects.first().uri_path @@ -155,7 +155,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = PageUniqueURIValidator() serializer = PageSerializer(instance=instance) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': instance.uri_prefix, 'uri_path': Page.objects.exclude(id=instance.id).first().uri_path diff --git a/rdmo/questions/tests/test_validator_unique_uri_questions.py b/rdmo/questions/tests/test_validator_unique_uri_questions.py index bcd53d8fe..f10c426ae 100644 --- a/rdmo/questions/tests/test_validator_unique_uri_questions.py +++ b/rdmo/questions/tests/test_validator_unique_uri_questions.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Catalog, Page, Question, QuestionSet, Section from ..serializers.v1 import QuestionSerializer @@ -130,7 +130,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = QuestionUniqueURIValidator() serializer = QuestionSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': Question.objects.first().uri_path @@ -155,7 +155,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = QuestionUniqueURIValidator() serializer = QuestionSerializer(instance=instance) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': instance.uri_prefix, 'uri_path': Question.objects.exclude(id=instance.id).first().uri_path diff --git a/rdmo/questions/tests/test_validator_unique_uri_questionsets.py b/rdmo/questions/tests/test_validator_unique_uri_questionsets.py index 5b4c9a734..222a120a5 100644 --- a/rdmo/questions/tests/test_validator_unique_uri_questionsets.py +++ b/rdmo/questions/tests/test_validator_unique_uri_questionsets.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Catalog, Page, Question, QuestionSet, Section from ..serializers.v1 import QuestionSetSerializer @@ -130,7 +130,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = QuestionSetUniqueURIValidator() serializer = QuestionSetSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': QuestionSet.objects.first().uri_path @@ -155,7 +155,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = QuestionSetUniqueURIValidator() serializer = QuestionSetSerializer(instance=instance) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': instance.uri_prefix, 'uri_path': QuestionSet.objects.exclude(id=instance.id).first().uri_path diff --git a/rdmo/questions/tests/test_validator_unique_uri_sections.py b/rdmo/questions/tests/test_validator_unique_uri_sections.py index 3af509afa..f0fad7726 100644 --- a/rdmo/questions/tests/test_validator_unique_uri_sections.py +++ b/rdmo/questions/tests/test_validator_unique_uri_sections.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Catalog, Page, Question, QuestionSet, Section from ..serializers.v1 import SectionSerializer @@ -130,7 +130,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = SectionUniqueURIValidator() serializer = SectionSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': Section.objects.first().uri_path @@ -155,7 +155,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = SectionUniqueURIValidator() serializer = SectionSerializer(instance=instance) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': instance.uri_prefix, 'uri_path': Section.objects.exclude(id=instance.id).first().uri_path diff --git a/rdmo/tasks/tests/test_validator_locked.py b/rdmo/tasks/tests/test_validator_locked.py index 45e1c1603..56a2624fa 100644 --- a/rdmo/tasks/tests/test_validator_locked.py +++ b/rdmo/tasks/tests/test_validator_locked.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Task from ..serializers.v1 import TaskSerializer @@ -93,7 +93,7 @@ def test_serializer_update_error(db): validator = TaskLockedValidator() serializer = TaskSerializer(instance=task) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/tasks/tests/test_validator_unique_uri.py b/rdmo/tasks/tests/test_validator_unique_uri.py index 14db7d394..ac9affb50 100644 --- a/rdmo/tasks/tests/test_validator_unique_uri.py +++ b/rdmo/tasks/tests/test_validator_unique_uri.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import Task from ..serializers.v1 import TaskSerializer @@ -58,7 +58,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = TaskUniqueURIValidator() serializer = TaskSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': Task.objects.filter(uri_prefix=settings.DEFAULT_URI_PREFIX).last().uri_path @@ -83,7 +83,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = TaskUniqueURIValidator() serializer = TaskSerializer(instance=task) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': task.uri_prefix, 'uri_path': Task.objects.filter(uri_prefix=settings.DEFAULT_URI_PREFIX).last().uri_path diff --git a/rdmo/views/tests/test_validator_locked.py b/rdmo/views/tests/test_validator_locked.py index d3091ed12..39038c07a 100644 --- a/rdmo/views/tests/test_validator_locked.py +++ b/rdmo/views/tests/test_validator_locked.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import View from ..serializers.v1 import ViewSerializer @@ -93,7 +93,7 @@ def test_serializer_update_error(db): validator = ViewLockedValidator() serializer = ViewSerializer(instance=view) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'locked': True }, serializer) diff --git a/rdmo/views/tests/test_validator_unique_uri.py b/rdmo/views/tests/test_validator_unique_uri.py index fbf44d934..2db51b58d 100644 --- a/rdmo/views/tests/test_validator_unique_uri.py +++ b/rdmo/views/tests/test_validator_unique_uri.py @@ -3,7 +3,7 @@ from django.conf import settings from django.core.exceptions import ValidationError -from rest_framework.exceptions import ValidationError as RestFameworkValidationError +from rest_framework.exceptions import ValidationError as RestFrameworkValidationError from ..models import View from ..serializers.v1 import ViewSerializer @@ -58,7 +58,7 @@ def test_unique_uri_validator_serializer_create_error(db): validator = ViewUniqueURIValidator() serializer = ViewSerializer() - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': settings.DEFAULT_URI_PREFIX, 'uri_path': View.objects.filter(uri_prefix=settings.DEFAULT_URI_PREFIX).last().uri_path @@ -83,7 +83,7 @@ def test_unique_uri_validator_serializer_update_error(db): validator = ViewUniqueURIValidator() serializer = ViewSerializer(instance=view) - with pytest.raises(RestFameworkValidationError): + with pytest.raises(RestFrameworkValidationError): validator({ 'uri_prefix': view.uri_prefix, 'uri_path': View.objects.filter(uri_prefix=settings.DEFAULT_URI_PREFIX).last().uri_path