From 9e97938bb42dc9392f6c8eea3d306b3deb2a56ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 24 Apr 2017 14:01:52 +0200 Subject: [PATCH 3/4] misc: allow running with django 1.11 (#15973) --- setup.py | 2 +- tests/test_manager.py | 29 ++++++++++++----------------- tests/test_sso.py | 6 +++--- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/setup.py b/setup.py index e8b5a39..31f4fdf 100644 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ setup( 'Programming Language :: Python', 'Programming Language :: Python :: 2', ], - install_requires=['django>=1.8, <1.9', + install_requires=['django>=1.8, <1.12', 'gadjo', 'djangorestframework>=3.1', 'django-jsonfield >= 0.9.3', diff --git a/tests/test_manager.py b/tests/test_manager.py index 09a4d13..7d4779f 100644 --- a/tests/test_manager.py +++ b/tests/test_manager.py @@ -51,7 +51,7 @@ def login(app, username='admin', password='admin'): def test_unlogged_access(app): # connect while not being logged in - assert app.get('/manage/', status=302).location == 'http://testserver/login/?next=/manage/' + assert app.get('/manage/', status=302).location.endswith('/login/?next=/manage/') def test_simple_user_access(app, simple_user): # connect while being logged as a simple user, access should be forbidden @@ -79,7 +79,7 @@ def test_manager_user_access(app, manager_user): assert app.get('/manage/', status=200) def test_home_redirect(app): - assert app.get('/', status=302).location == 'http://testserver/manage/' + assert app.get('/', status=302).location.endswith('/manage/') def test_access(app, admin_user): app = login(app) @@ -90,12 +90,7 @@ def test_access(app, admin_user): def test_logout(app, admin_user): app = login(app) app.get('/logout/') - assert app.get('/manage/', status=302).location == 'http://testserver/login/?next=/manage/' - -def test_logout_next(app, admin_user): - app = login(app) - app.get('/logout/') - assert app.get('/manage/', status=302).location == 'http://testserver/login/?next=/manage/' + assert app.get('/manage/', status=302).location.endswith('/login/?next=/manage/') def test_menu_json(app, admin_user): app = login(app) @@ -129,7 +124,7 @@ def test_add_agenda(app, admin_user): resp = resp.form.submit() agenda = Agenda.objects.get(label='Foo bar') - assert resp.location == 'http://testserver/manage/agendas/%s/' % agenda.id + assert resp.location.endswith('/manage/agendas/%s/' % agenda.id) resp = resp.follow() assert '

Foo bar' in resp.body @@ -153,7 +148,7 @@ def test_options_agenda(app, admin_user): assert resp.form['label'].value == 'Foo bar' resp.form['label'] = 'Foo baz' resp = resp.form.submit() - assert resp.location == 'http://testserver/manage/agendas/%s/' % agenda.id + assert resp.location.endswith('/manage/agendas/%s/' % agenda.id) resp = resp.follow() assert '

Foo baz' in resp.body @@ -176,7 +171,7 @@ def test_options_agenda_as_manager(app, manager_user): assert resp.form['label'].value == 'Foo bar' resp.form['label'] = 'Foo baz' resp = resp.form.submit() - assert resp.location == 'http://testserver/manage/agendas/%s/' % agenda.id + assert resp.location.endswith('/manage/agendas/%s/' % agenda.id) resp = resp.follow() assert '

Foo baz' in resp.body @@ -188,7 +183,7 @@ def test_delete_agenda(app, admin_user): resp = resp.click('Foo bar') resp = resp.click('Delete') resp = resp.form.submit() - assert resp.location == 'http://testserver/manage/' + assert resp.location.endswith('/manage/') resp = resp.follow() assert not 'Foo bar' in resp.body @@ -380,7 +375,7 @@ def test_delete_event(app, admin_user): resp = resp.click(href='/manage/events/%s' % event.id) resp = resp.click('Delete') resp = resp.form.submit() - assert resp.location == 'http://testserver/manage/agendas/%s/' % agenda.id + assert resp.location.endswith('/manage/agendas/%s/' % agenda.id) assert Event.objects.count() == 0 def test_delete_busy_event(app, admin_user): @@ -429,7 +424,7 @@ def test_delete_event_as_manager(app, manager_user): resp = resp.click(href='/manage/events/%s' % event.id) resp = resp.click('Delete') resp = resp.form.submit() - assert resp.location == 'http://testserver/manage/agendas/%s/' % agenda.id + assert resp.location.endswith('/manage/agendas/%s/' % agenda.id) assert Event.objects.count() == 0 def test_import_events(app, admin_user): @@ -517,7 +512,7 @@ def test_add_meetings_agenda(app, admin_user): resp.form['kind'] = 'meetings' resp = resp.form.submit() agenda = Agenda.objects.get(label='Foo bar') - assert resp.location == 'http://testserver/manage/agendas/%s/' % agenda.id + assert resp.location.endswith('/manage/agendas/%s/' % agenda.id) resp = resp.follow() assert '

Foo bar' in resp.body assert 'Meeting Types' in resp.body @@ -557,7 +552,7 @@ def test_meetings_agenda_delete_meeting_type(app, admin_user): resp = resp.click('Blah') resp = resp.click('Delete') resp = resp.form.submit() - assert resp.location == 'http://testserver/manage/agendas/%s/' % agenda.id + assert resp.location.endswith('/manage/agendas/%s/' % agenda.id) assert MeetingType.objects.count() == 0 def test_meetings_agenda_add_time_period(app, admin_user): @@ -610,5 +605,5 @@ def test_meetings_agenda_delete_time_period(app, admin_user): resp = resp.click('Wednesday') resp = resp.click('Delete') resp = resp.form.submit() - assert resp.location == 'http://testserver/manage/agendas/%s/' % agenda.id + assert resp.location.endswith('/manage/agendas/%s/' % agenda.id) assert TimePeriod.objects.count() == 0 diff --git a/tests/test_sso.py b/tests/test_sso.py index 25f86ab..94edb3c 100644 --- a/tests/test_sso.py +++ b/tests/test_sso.py @@ -10,12 +10,12 @@ pytestmark = pytest.mark.django_db def test_sso(app): with override_settings(MELLON_IDENTITY_PROVIDERS=[{'METADATA': 'x', 'ENTITY_ID': 'x'}]): resp = app.get('/login/') - assert resp.location == 'http://testserver/accounts/mellon/login/' + assert resp.location.endswith('/accounts/mellon/login/') resp = app.get('/login/?next=/manage/') - assert resp.location == 'http://testserver/accounts/mellon/login/?next=/manage/' + assert resp.location.endswith('/accounts/mellon/login/?next=/manage/') def test_slo(app): with override_settings(MELLON_IDENTITY_PROVIDERS=[{'METADATA': 'x', 'ENTITY_ID': 'x'}]): resp = app.get('/logout/') - assert resp.location == 'http://testserver/accounts/mellon/logout/' + assert resp.location.endswith('/accounts/mellon/logout/') -- 2.11.0