From 26ca2ccf3e01e2472570ab2b259dde35e61a9c1f Mon Sep 17 00:00:00 2001 From: Domenico DiNicola Date: Mon, 22 Feb 2016 17:00:42 +0100 Subject: [PATCH] compatibility 1.9 --- .../delete_selected_confirmation.html | 1 - tests/test_admin_actions.py | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/concurrency/templates/concurrency/delete_selected_confirmation.html b/src/concurrency/templates/concurrency/delete_selected_confirmation.html index 03cf6ad..e73498f 100644 --- a/src/concurrency/templates/concurrency/delete_selected_confirmation.html +++ b/src/concurrency/templates/concurrency/delete_selected_confirmation.html @@ -1,6 +1,5 @@ {% extends "admin/base_site.html" %}{% load concurrency %} {% load i18n l10n %} -{% load url from future %} {% load admin_urls %} {% block breadcrumbs %} diff --git a/tests/test_admin_actions.py b/tests/test_admin_actions.py index 0713648..f0cc297 100644 --- a/tests/test_admin_actions.py +++ b/tests/test_admin_actions.py @@ -88,3 +88,21 @@ def test_delete_not_allowed_if_updates(self): sel.checked = True res = form.submit().follow() self.assertIn('One or more record were updated', res) + + + @pytest.mark.django_db + def test_deleteaction(self): + id = next(unique_id) + + SimpleConcurrentModel.objects.get_or_create(pk=id) + response = self.app.get(django.core.urlresolvers.reverse('admin:demo_simpleconcurrentmodel_changelist'), + user='sax') + form = response.forms['changelist-form'] + form.get('_selected_action', index=0).checked = True + form['action'] = 'delete_selected' + response = form.submit() + expected = 'All of the following objects and their related items will be deleted' + assert expected in response + response = response.form.submit().follow() + assert response.status_code == 200 +