diff --git a/requirements/base.in b/requirements/base.in index 657f868..e4f5ccb 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -7,7 +7,7 @@ furl # Framework libraries django-jsonsuit sharing-configs -django-setup-configuration>=0.4.0 +django-setup-configuration>=0.5.0 mozilla-django-oidc-db[django-setup-configuration] # API libraries diff --git a/requirements/base.txt b/requirements/base.txt index d1a9193..90ac5d5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -156,7 +156,7 @@ django-sendfile2==0.7.0 # via django-privates django-sessionprofile==3.0.0 # via open-api-framework -django-setup-configuration==0.4.0 +django-setup-configuration==0.5.0 # via # -r requirements/base.in # open-api-framework @@ -252,7 +252,7 @@ mozilla-django-oidc-db[django-setup-configuration]==0.21.1 # open-api-framework notifications-api-common==0.3.1 # via commonground-api-common -open-api-framework==0.9.0 +open-api-framework==0.9.1 # via -r requirements/base.in orderedmultidict==1.0.1 # via furl diff --git a/requirements/ci.txt b/requirements/ci.txt index 3ea0799..3ca4980 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -242,7 +242,7 @@ django-sessionprofile==3.0.0 # via # -r requirements/base.txt # open-api-framework -django-setup-configuration==0.4.0 +django-setup-configuration==0.5.0 # via # -r requirements/base.txt # open-api-framework @@ -412,7 +412,7 @@ notifications-api-common==0.3.1 # via # -r requirements/base.txt # commonground-api-common -open-api-framework==0.9.0 +open-api-framework==0.9.1 # via -r requirements/base.txt orderedmultidict==1.0.1 # via diff --git a/requirements/dev.txt b/requirements/dev.txt index db2ae30..7a4b1c3 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -253,7 +253,7 @@ django-sessionprofile==3.0.0 # via # -r requirements/base.txt # open-api-framework -django-setup-configuration==0.4.0 +django-setup-configuration==0.5.0 # via # -r requirements/base.txt # open-api-framework @@ -430,7 +430,7 @@ notifications-api-common==0.3.1 # via # -r requirements/base.txt # commonground-api-common -open-api-framework==0.9.0 +open-api-framework==0.9.1 # via -r requirements/base.txt orderedmultidict==1.0.1 # via diff --git a/src/objecttypes/conf/base.py b/src/objecttypes/conf/base.py index c409904..b540364 100644 --- a/src/objecttypes/conf/base.py +++ b/src/objecttypes/conf/base.py @@ -53,5 +53,6 @@ # SETUP_CONFIGURATION_STEPS = [ "objecttypes.setup_configuration.steps.token_auth.TokenAuthConfigurationStep", + "django_setup_configuration.contrib.sites.steps.SitesConfigurationStep", "mozilla_django_oidc_db.setup_configuration.steps.AdminOIDCConfigurationStep", ] diff --git a/src/objecttypes/setup_configuration/tests/test_token_auth_config.py b/src/objecttypes/setup_configuration/tests/test_token_auth_config.py index 3870595..29461e1 100644 --- a/src/objecttypes/setup_configuration/tests/test_token_auth_config.py +++ b/src/objecttypes/setup_configuration/tests/test_token_auth_config.py @@ -351,10 +351,7 @@ def test_invalid_setup_identifier(self): ], }, } - with self.assertRaises(ConfigurationRunFailed) as command_error: + with self.assertRaises(PrerequisiteFailed) as command_error: execute_single_step(TokenAuthConfigurationStep, object_source=object_source) - self.assertTrue( - "Validation error(s) occured for invalid identifier" - in str(command_error.exception) - ) + self.assertTrue("String should match pattern" in str(command_error.exception)) self.assertEqual(TokenAuth.objects.count(), 0)