Commit 0dc37df

committed

♻️ update settings key

1 parent 2ac9783 commit 0dc37dfCopy full SHA for 0dc37df

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,23 @@`
`1`	`1`	`from django.conf import ImproperlyConfigured`
`2`	`2`	`from django.conf import settings as django_settings`
`3`	`3`
	`4`	`+from .constants import Events`
	`5`	`+`
	`6`	`+SETTINGS_KEY = "DJANGO_GITLAB_WEBHOOKS"`
	`7`	`+`
`4`	`8`
`5`	`9`	`def load_settings() -> None:`
`6`	`10`	`try:`
`7`		`- settings = django_settings.GITLAB_WEBHOOKS`
	`11`	`+ settings = getattr(django_settings, SETTINGS_KEY)`
`8`	`12`	`except AttributeError:`
`9`		`- raise ImproperlyConfigured("GITLAB_WEBHOOKS settings is missing!")`
	`13`	`+ raise ImproperlyConfigured(`
	`14`	`+ "{settings_key} settings is missing!".format(settings_key=SETTINGS_KEY)`
	`15`	`+ )`
`10`	`16`
`11`	`17`	`if not isinstance(settings, dict):`
`12`		`- raise ImproperlyConfigured("GITLAB_WEBHOOKS is not a dict!")`
	`18`	`+ raise ImproperlyConfigured(`
	`19`	`+ "{settings_key} is not a dict!".format(settings_key=SETTINGS_KEY)`
	`20`	`+ )`
`13`	`21`
`14`		`- # Your settings goes here ...`
`15`		`- # if "ALLOWED_EVENTS" not in settings:`
`16`		`- # settings["ALLOWED_EVENTS"] = ["test"]`
	`22`	`+ if not settings.get("ALLOWED_EVENTS"):`
	`23`	`+ settings["ALLOWED_EVENTS"] = Events.values()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ def test_load_settings_success():`
`8`	`8`
`9`	`9`
`10`	`10`	`def test_missed_settings(settings):`
`11`		`- del settings.GITLAB_WEBHOOKS`
	`11`	`+ del settings.DJANGO_GITLAB_WEBHOOKS`
`12`	`12`	`with pytest.raises(ImproperlyConfigured):`
`13`	`13`	`app_settings.load_settings()`
`14`	`14`
`15`	`15`
`16`	`16`	`def test_settings_is_not_a_dict(settings):`
`17`		`- settings.GITLAB_WEBHOOKS = list()`
	`17`	`+ settings.DJANGO_GITLAB_WEBHOOKS = list()`
`18`	`18`	`with pytest.raises(ImproperlyConfigured):`
`19`	`19`	`app_settings.load_settings()`

Comments

(0)