File tree 5 files changed +17
-28
lines changed
5 files changed +17
-28
lines changed Original file line number Diff line number Diff line change @@ -82,14 +82,14 @@ private.py
82
82
# pyenv
83
83
.python-version
84
84
85
+ # Visual Studio Code
86
+ .vscode
87
+
85
88
* .trace
86
89
90
+ .cache /
91
+ credentials /media /
87
92
credentials /static /bundles /
88
93
docs /_build /
89
94
node_modules /
90
- credentials /media /
91
95
webpack-stats.json
92
-
93
-
94
- # Visual Studio Code
95
- .vscode
Original file line number Diff line number Diff line change @@ -45,14 +45,14 @@ clean_static:
45
45
46
46
production-requirements :
47
47
npm install --production
48
- pip install -r requirements.txt --exists-action w
48
+ pip install -r requirements.txt
49
49
50
50
requirements :
51
51
npm install
52
52
pip install -r requirements/local.txt
53
53
54
54
test : clean
55
- coverage run ./manage.py test credentials --settings=credentials.settings.test
55
+ coverage run -m pytest
56
56
coverage report
57
57
58
58
quality :
@@ -74,7 +74,7 @@ static.watch:
74
74
serve :
75
75
python manage.py runserver 0.0.0.0:8150
76
76
77
- validate : test quality
77
+ validate : quality test
78
78
79
79
migrate :
80
80
python manage.py migrate
Original file line number Diff line number Diff line change 5
5
from credentials .settings .base import *
6
6
from credentials .settings .utils import get_logger_config
7
7
8
- # TEST SETTINGS
8
+
9
9
INSTALLED_APPS += [
10
- 'django_nose' ,
11
10
'credentials.apps.edx_credentials_extensions' ,
12
11
]
13
12
14
- TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
15
-
16
- NOSE_ARGS = [
17
- '--with-ignore-docstrings' ,
18
- '--logging-level=DEBUG' ,
19
- ]
20
- # LOGGING
21
13
LOGGING = get_logger_config (debug = False , dev_env = True , local_loglevel = 'DEBUG' )
22
- # END TEST SETTINGS
23
-
24
14
25
- # IN-MEMORY TEST DATABASE
26
15
DATABASES = {
27
16
'default' : {
28
17
'ENGINE' : 'django.db.backends.sqlite3' ,
33
22
'PORT' : '' ,
34
23
},
35
24
}
36
- # END IN-MEMORY TEST DATABASE
37
25
38
26
# Local Directories
39
- TEST_ROOT = path (" test_root" )
27
+ TEST_ROOT = path (' test_root' )
40
28
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
41
- MEDIA_ROOT = TEST_ROOT / " uploads"
42
- MEDIA_URL = " /static/uploads/"
29
+ MEDIA_ROOT = TEST_ROOT / ' uploads'
30
+ MEDIA_URL = ' /static/uploads/'
43
31
44
- # AUTHENTICATION
45
32
OAUTH2_PROVIDER_URL = 'https://test-provider/oauth2'
46
33
SOCIAL_AUTH_EDX_OIDC_URL_ROOT = OAUTH2_PROVIDER_URL
47
34
50
37
'JWT_ISSUER' : OAUTH2_PROVIDER_URL ,
51
38
'JWT_AUDIENCE' : SOCIAL_AUTH_EDX_OIDC_KEY ,
52
39
})
53
- # END AUTHENTICATION
Original file line number Diff line number Diff line change
1
+ [pytest]
2
+ DJANGO_SETTINGS_MODULE = credentials.settings.test
3
+ testpaths = credentials/apps
Original file line number Diff line number Diff line change 4
4
bok-choy==0.6.1
5
5
coverage==4.3.4
6
6
ddt==1.1.1
7
- django-nose==1.4.4
8
7
edx-lint==0.5.2
9
8
factory-boy==2.8.1
10
9
httpretty==0.8.14
11
10
isort==4.2.5
12
11
mock==2.0.0
13
- nose-ignore-docstring==0.2
14
12
pep8==1.7.0
13
+ pytest==3.0.7
14
+ pytest-django==3.1.2
15
15
responses==0.5.1
16
16
testfixtures==4.13.4
You can’t perform that action at this time.
0 commit comments