diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py index ec7b19d12..b2d8e9a5e 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py @@ -282,6 +282,49 @@ class ResourceClassViewTests(test.BaseAdminViewTests): self.assertTemplateUsed(res, 'infrastructure/resource_management/resource_classes/detail.html') + @test.create_stubs({ + tuskar.ResourceClass: ('get',) + }) + def test_detail_action_get(self): + resource_class = self.tuskar_resource_classes.first() + + tuskar.ResourceClass.get( + mox.IsA(http.HttpRequest), + resource_class.id).AndReturn(resource_class) + + self.mox.ReplayAll() + + url = urlresolvers.reverse( + 'horizon:infrastructure:resource_management:resource_classes:' + 'detail_action', args=[resource_class.id]) + "?action=delete" + res = self.client.get(url) + self.assertEqual(res.status_code, 200) + + @test.create_stubs({ + tuskar.ResourceClass: ('get', 'delete') + }) + def test_detail_action_post(self): + resource_class = self.tuskar_resource_classes.first() + + tuskar.ResourceClass.get( + mox.IsA(http.HttpRequest), + resource_class.id).AndReturn(resource_class) + tuskar.ResourceClass.delete(mox.IsA(http.HttpRequest), + resource_class.id) + + self.mox.ReplayAll() + + url = urlresolvers.reverse( + 'horizon:infrastructure:resource_management:resource_classes:' + 'detail_action', args=[resource_class.id]) + "?action=delete" + res = self.client.post(url) + self.assertNoFormErrors(res) + self.assertMessageCount(success=1) + + redirect_url = urlresolvers.reverse('horizon:infrastructure:' + 'resource_management:index') + self.assertRedirectsNoFollow(res, redirect_url) + @test.create_stubs({ tuskar.ResourceClass: ('get', 'list_racks') }) diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/views.py b/tuskar_ui/infrastructure/resource_management/resource_classes/views.py index a2c3185e5..0dd05ffa8 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/views.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/views.py @@ -142,7 +142,7 @@ class DetailActionView(horizon_forms.ModalFormView): def get_success_url(self): # FIXME this should be set on form level return urlresolvers.reverse('horizon:infrastructure:' - 'resource_management:index') + 'resource_management:index') def get_context_data(self, **kwargs): context = super(DetailActionView, self).get_context_data(**kwargs)