1
1
import pytest
2
2
from django_webtest import DjangoTestApp , WebTestMixin
3
3
4
- DEFAULT_MARK = object ()
5
4
5
+ class OurTestApp (DjangoTestApp ):
6
6
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 )
8
10
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 )
25
15
26
16
27
17
@pytest .fixture (scope = 'function' )
@@ -39,4 +29,4 @@ def app(request, admin_user):
39
29
wtm ._patch_settings ()
40
30
request .addfinalizer (wtm ._unpatch_settings )
41
31
# 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