diff --git a/django_pyvows/context.py b/django_pyvows/context.py index 0547cf6..a97cdd1 100644 --- a/django_pyvows/context.py +++ b/django_pyvows/context.py @@ -29,12 +29,6 @@ class DjangoContext(Vows.Context): if not settings_path: raise RuntimeError('The settings_path argument is required.') os.environ['DJANGO_SETTINGS_MODULE'] = settings_path - try: - from django.conf import settings - # to register all models in admin - __import__(settings.ROOT_URLCONF) - except ImportError: - pass settings_tracker.install() def __init__(self, parent): @@ -50,7 +44,7 @@ class DjangoContext(Vows.Context): if 'DJANGO_SETTINGS_MODULE' in os.environ: return os.environ['DJANGO_SETTINGS_MODULE'] else: - raise NotImplementedError('Should be implemented the "get_settings" method.') + return 'settings' def url(self, path): return Url(self, path) diff --git a/vows/context_vows.py b/vows/context_vows.py index 167f081..e4ba9e5 100644 --- a/vows/context_vows.py +++ b/vows/context_vows.py @@ -12,8 +12,6 @@ from pyvows import Vows, expect from django_pyvows.context import DjangoContext, DjangoHTTPContext -DjangoContext.start_environment("sandbox.settings") - @Vows.batch class ContextTest(Vows.Context): diff --git a/vows/model_vows.py b/vows/model_vows.py index 2636f78..8f45377 100644 --- a/vows/model_vows.py +++ b/vows/model_vows.py @@ -55,16 +55,4 @@ class ModelVows(DjangoContext): def should_have_a_name_field_as_charfield_and_max_length_100(self, topic): expect(topic).to_have_field('name', models.CharField, max_length=100) - class AdminModel(DjangoContext): - - def should_be_registred_in_admin(self, topic): - expect(topic).to_be_in_admin() - - class StringModelInAdminOptions(DjangoContext): - - def topic(self, model): - return model.admin - - def should_be_listed_by_name(self, topic): - expect('name' in topic.list_display).to_be_true()