diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-19 16:04:23 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-19 16:04:23 -0500 |
| commit | 74ae6fb0b620c2f899e2c97ba5f6af105103df6f (patch) | |
| tree | 1fc5a7634299ba221858536a12d3fa8066a1898f /mediagoblin/tests/test_openid.py | |
| parent | 3dc6184167691d390f016c2b73fd6a9887955102 (diff) | |
| parent | f9931418d65c7823e13bc45f647a682ddf3b8632 (diff) | |
| download | mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.tar.lz mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.tar.xz mediagoblin-74ae6fb0b620c2f899e2c97ba5f6af105103df6f.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'
Conflicts:
mediagoblin/auth/views.py
mediagoblin/edit/forms.py
mediagoblin/templates/mediagoblin/edit/edit_account.html
Diffstat (limited to 'mediagoblin/tests/test_openid.py')
| -rw-r--r-- | mediagoblin/tests/test_openid.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py index 23a2290e..3dfafb60 100644 --- a/mediagoblin/tests/test_openid.py +++ b/mediagoblin/tests/test_openid.py @@ -29,6 +29,7 @@ from mediagoblin.plugins.openid.models import OpenIDUserURL from mediagoblin.tests.tools import get_app, fixture_add_user from mediagoblin.tools import template + # App with plugin enabled @pytest.fixture() def openid_plugin_app(request): |