fix(controller): restore App.destroy() and call delete()

The change in deis/deis#839 didn't account
for Django REST framework methods that indirectly call delete().

Fixes #927.

Author: mboersma

controller/api/models.py

@@ -134,6 +134,9 @@ def deploy(self, release):
             self.save()
             self.scale()
 
+    def destroy(self, *args, **kwargs):
+        return self.delete(*args, **kwargs)
+
     def scale(self, **kwargs):
         """Scale containers up or down to match requested."""
         requested_containers = self.structure.copy()

controller/api/tests/test_cluster.py

@@ -45,6 +45,12 @@ def test_cluster(self):
         response = self.client.get('/api/clusters')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 1)
+        # ensure we can delete the cluster with an app
+        # see https://github.com/deis/deis/issues/927
+        url = '/api/apps'
+        body = {'cluster': 'autotest'}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
         url = '/api/clusters/{cluster_id}'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)