diff --git a/src/pretix/settings.py b/src/pretix/settings.py index d7e6ea5e1..34777b38a 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -95,7 +95,6 @@ INSTALLED_APPS = ( 'bootstrap3', 'debug_toolbar.apps.DebugToolbarConfig', 'djangoformsetjs', - 'pretix.plugins.testdummy', 'pretix.plugins.timerestriction', 'pretix.plugins.banktransfer', 'pretix.plugins.stripe', diff --git a/src/tests/base/test_plugins.py b/src/tests/base/test_plugins.py index bc7980237..2ffe6e35c 100644 --- a/src/tests/base/test_plugins.py +++ b/src/tests/base/test_plugins.py @@ -49,9 +49,9 @@ class PluginSignalTest(TestCase): self.assertEqual(len(responses), 0) def test_one_plugin_active(self): - self.event.plugins = 'pretix.plugins.testdummy' + self.event.plugins = 'tests.testdummy' self.event.save() payload = {'foo': 'bar'} responses = determine_availability.send(self.event, **payload) self.assertEqual(len(responses), 1) - self.assertIn('pretix.plugins.testdummy.signals', [r[0].__module__ for r in responses]) + self.assertIn('tests.testdummy.signals', [r[0].__module__ for r in responses]) diff --git a/src/tests/presale/test_cart.py b/src/tests/presale/test_cart.py index e58d933b3..88242782a 100644 --- a/src/tests/presale/test_cart.py +++ b/src/tests/presale/test_cart.py @@ -328,7 +328,7 @@ class CartTest(CartTestMixin, TestCase): self.assertFalse(CartPosition.objects.current.filter(user=self.user, event=self.event).exists()) def test_restriction_failed(self): - self.event.plugins = 'pretix.plugins.testdummy' + self.event.plugins = 'tests.testdummy' self.event.save() self.event.settings.testdummy_available = 'yes' response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { @@ -343,7 +343,7 @@ class CartTest(CartTestMixin, TestCase): self.assertEqual(objs[0].price, 23) def test_restriction_ok(self): - self.event.plugins = 'pretix.plugins.testdummy' + self.event.plugins = 'tests.testdummy' self.event.save() self.event.settings.testdummy_available = 'no' response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { diff --git a/src/tests/settings.py b/src/tests/settings.py index 34b7a3e6d..dbb063ad7 100644 --- a/src/tests/settings.py +++ b/src/tests/settings.py @@ -3,3 +3,7 @@ from pretix.settings import * TEST_DIR = os.path.dirname(__file__) TEMPLATES[0]['DIRS'].append(os.path.join(TEST_DIR, 'templates')) + +INSTALLED_APPS = INSTALLED_APPS + ( + 'tests.testdummy', +) diff --git a/src/pretix/plugins/testdummy/__init__.py b/src/tests/testdummy/__init__.py similarity index 67% rename from src/pretix/plugins/testdummy/__init__.py rename to src/tests/testdummy/__init__.py index 2e8e07261..466f761ae 100644 --- a/src/pretix/plugins/testdummy/__init__.py +++ b/src/tests/testdummy/__init__.py @@ -3,7 +3,7 @@ from pretix.base.plugins import PluginType class TestDummyApp(AppConfig): - name = 'pretix.plugins.testdummy' + name = 'tests.testdummy' verbose_name = '.testdummy' class PretixPluginMeta: @@ -12,6 +12,7 @@ class TestDummyApp(AppConfig): version = '1.0.0' def ready(self): - from . import signals # NOQA + from tests.testdummy import signals -default_app_config = 'pretix.plugins.testdummy.TestDummyApp' + +default_app_config = 'tests.testdummy.TestDummyApp' diff --git a/src/pretix/plugins/testdummy/models.py b/src/tests/testdummy/models.py similarity index 100% rename from src/pretix/plugins/testdummy/models.py rename to src/tests/testdummy/models.py diff --git a/src/pretix/plugins/testdummy/signals.py b/src/tests/testdummy/signals.py similarity index 100% rename from src/pretix/plugins/testdummy/signals.py rename to src/tests/testdummy/signals.py