Skip to content

Commit 8d32856

Browse files
committed
Simplifica conf do webtest (refatoração)
1 parent ca4384d commit 8d32856

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

conftest.py

+9-19
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
import pytest
22
from django_webtest import DjangoTestApp, WebTestMixin
33

4-
DEFAULT_MARK = object()
54

5+
class OurTestApp(DjangoTestApp):
66

7-
class SaplTestApp(DjangoTestApp):
7+
def __init__(self, *args, **kwargs):
8+
self.default_user = kwargs.pop('default_user', None)
9+
super(OurTestApp, self).__init__(*args, **kwargs)
810

9-
def __init__(self, extra_environ=None, relative_to=None,
10-
default_user=None):
11-
super(SaplTestApp, self).__init__(extra_environ, relative_to)
12-
self.default_user = default_user
13-
14-
def get(self, url, params=None, headers=None, extra_environ=None,
15-
status=None, expect_errors=False, user=DEFAULT_MARK,
16-
auto_follow=True, content_type=None, **kwargs):
17-
# note we altered the default values for user and auto_follow
18-
19-
if user is DEFAULT_MARK: # a trick to allow explicit user=None
20-
user = self.default_user
21-
22-
return super(SaplTestApp, self).get(
23-
url, params, headers, extra_environ, status, expect_errors, user,
24-
auto_follow, content_type, **kwargs)
11+
def get(self, *args, **kwargs):
12+
kwargs.setdefault('user', self.default_user)
13+
kwargs.setdefault('auto_follow', True)
14+
return super(OurTestApp, self).get(*args, **kwargs)
2515

2616

2717
@pytest.fixture(scope='function')
@@ -39,4 +29,4 @@ def app(request, admin_user):
3929
wtm._patch_settings()
4030
request.addfinalizer(wtm._unpatch_settings)
4131
# XXX change this admin user to "saploper"
42-
return SaplTestApp(default_user=admin_user.username)
32+
return OurTestApp(default_user=admin_user.username)

0 commit comments

Comments
 (0)