Fix capsul create tests, post-test cleanup, tidy merge

capsulflask/__init__.py

@@ -26,7 +26,6 @@ from capsulflask.http_client import MyHTTPClient
 
 
 def create_app():
-
   for var_name in [
     "SPOKE_HOST_TOKEN", "HUB_TOKEN", "STRIPE_SECRET_KEY",
     "BTCPAY_PRIVATE_KEY", "MAIL_PASSWORD"
@@ -219,7 +218,6 @@ if app.config['BTCPAY_URL'] != "":
 
     return app
 
-
 def url_for_with_cache_bust(endpoint, **values):
   """
   Add a query parameter based on the hash of the file, this acts as a cache bust

capsulflask/console.py

@@ -272,7 +272,6 @@ def create():
       
       return redirect(f"{url_for('console.index')}?created={id}")
 
-
   for error in errors:
     flash(error)
 
@@ -353,14 +352,10 @@ def ssh_public_keys():
   )
 
 def get_vms():
-  if 'user_vms' not in g:
+  return get_model().list_vms_for_account(session["account"])
-    g.user_vms = get_model().list_vms_for_account(session["account"])
-  return g.user_vms
 
 def get_payments():
-  if 'user_payments' not in g:
+  return get_model().list_payments_for_account(session["account"])
-    g.user_payments = get_model().list_payments_for_account(session["account"])
-  return g.user_payments
 
 
 average_number_of_days_in_a_month = 30.44

capsulflask/tests/test_console.py

@@ -1,7 +1,12 @@
+from copy import deepcopy
+
+from unittest.mock import patch
+
 from flask import url_for
 
 from capsulflask.db import get_model
 from capsulflask.tests_base import BaseTestCase
+from capsulflask.hub_model import MockHub
 
 
 class ConsoleTests(BaseTestCase):
@@ -30,7 +35,7 @@ class ConsoleTests(BaseTestCase):
             response = client.get(url_for("console.create"))
             self.assert_200(response)
 
-    def test_create_fails_capacity(self):
+    def test_create_fails_credit(self):
         with self.client as client:
             client.get(url_for("console.create"))
             csrf_token = self.get_context_variable('csrf_token')
@@ -38,6 +43,33 @@ class ConsoleTests(BaseTestCase):
             data = self.capsul_data
             data['csrf-token'] = csrf_token
             client.post(url_for("console.create"), data=data)
+
+            capacity_message = \
+                'Your account must have enough credit to run an f1-xs for 1 month before you will be allowed to create it'
+            self.assert_message_flashed(capacity_message, category='message')
+
+            self.assertEqual(
+                len(get_model().list_vms_for_account('test@example.com')),
+                0
+            )
+
+
+    def test_create_fails_capacity(self):
+        with self.client as client:
+            client.get(url_for("console.create"))
+            csrf_token = self.get_context_variable('csrf_token')
+
+            data = self.capsul_data
+            data['csrf-token'] = csrf_token
+                
+            get_model().create_payment_session('fake', 'test', 'test@example.com', 20)
+            get_model().consume_payment_session('fake', 'test', 20)
+
+            with patch.object(MockHub, 'capacity_avaliable', return_value=False) as mock_method:
+                response = client.post(url_for("console.create"), data=data)
+
+            mock_method.assert_called()
+
             capacity_message = \
                 '\n        host(s) at capacity. no capsuls can be created at this time. sorry. \n      '
             self.assert_message_flashed(capacity_message, category='message')
@@ -52,7 +84,7 @@ class ConsoleTests(BaseTestCase):
             client.get(url_for("console.create"))
             csrf_token = self.get_context_variable('csrf_token')
 
-            data = self.capsul_data
+            data = deepcopy(self.capsul_data)
             data['csrf-token'] = csrf_token
             data['os'] = ''
             client.post(url_for("console.create"), data=data)
@@ -72,23 +104,26 @@ class ConsoleTests(BaseTestCase):
             client.get(url_for("console.create"))
             csrf_token = self.get_context_variable('csrf_token')
 
-            data = self.capsul_data
+            data = deepcopy(self.capsul_data)
             data['csrf-token'] = csrf_token
+
+            get_model().create_payment_session('fake', 'test', 'test@example.com', 20)
+            get_model().consume_payment_session('fake', 'test', 20)
+
             response = client.post(url_for("console.create"), data=data)
 
-            # FIXME: mock create doesn't create, see #83
+            vms = get_model().list_vms_for_account('test@example.com')
-            # vms = get_model().list_vms_for_account('test@example.com')
+            self.assertEqual(
-            # self.assertEqual(
+                len(vms),
-            #     len(vms),
+                1 
-            #     1 
+            )
-            # )
+            
-            #
+            vm_id = vms[0]['id']
-            # vm_id = vms[0].id
+            
-            #
+            self.assertRedirects(
-            # self.assertRedirects(
+                response, 
-            #     response, 
+                url_for("console.index") + f'?created={vm_id}'
-            #     url_for("console.index") + f'?{vm_id}'
+            )
-            # )
 
     def test_keys_loads(self):
         self._login('test@example.com')
@@ -143,10 +178,13 @@ class ConsoleTests(BaseTestCase):
                 category='message'
             )
 
-
     def setUp(self):
         self._login('test@example.com')
         get_model().create_ssh_public_key('test@example.com', 'key', 'foo') 
 
     def tearDown(self):
-        get_model().delete_ssh_public_key('test@example.com', 'key') 
+        get_model().cursor.execute("DELETE FROM ssh_public_keys")
+        get_model().cursor.execute("DELETE FROM login_tokens")
+        get_model().cursor.execute("DELETE FROM vms")
+        get_model().cursor.execute("DELETE FROM payments")
+        get_model().cursor.connection.commit()