mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	[soc2009/multidb] Merged up to trunk r11858.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
		| @@ -1157,7 +1157,6 @@ class AdminActionsTest(TestCase): | ||||
|         self.assert_('action-checkbox-column' in response.content, | ||||
|             "Expected an action-checkbox-column in response") | ||||
|  | ||||
|  | ||||
|     def test_multiple_actions_form(self): | ||||
|         """ | ||||
|         Test that actions come from the form whose submit button was pressed (#10618). | ||||
| @@ -1175,6 +1174,35 @@ class AdminActionsTest(TestCase): | ||||
|         self.assertEquals(len(mail.outbox), 1) | ||||
|         self.assertEquals(mail.outbox[0].subject, 'Greetings from a function action') | ||||
|  | ||||
|     def test_user_message_on_none_selected(self): | ||||
|         """ | ||||
|         User should see a warning when 'Go' is pressed and no items are selected. | ||||
|         """ | ||||
|         action_data = { | ||||
|             ACTION_CHECKBOX_NAME: [], | ||||
|             'action' : 'delete_selected', | ||||
|             'index': 0, | ||||
|         } | ||||
|         response = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data) | ||||
|         msg = """Items must be selected in order to perform actions on them. No items have been changed.""" | ||||
|         self.assertContains(response, msg) | ||||
|         self.failUnlessEqual(Subscriber.objects.count(), 2) | ||||
|  | ||||
|     def test_user_message_on_no_action(self): | ||||
|         """ | ||||
|         User should see a warning when 'Go' is pressed and no action is selected. | ||||
|         """ | ||||
|         action_data = { | ||||
|             ACTION_CHECKBOX_NAME: [1, 2], | ||||
|             'action' : '', | ||||
|             'index': 0, | ||||
|         } | ||||
|         response = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data) | ||||
|         msg = """No action selected.""" | ||||
|         self.assertContains(response, msg) | ||||
|         self.failUnlessEqual(Subscriber.objects.count(), 2) | ||||
|  | ||||
|  | ||||
| class TestInlineNotEditable(TestCase): | ||||
|     fixtures = ['admin-views-users.xml'] | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user