Fixed tests and logout action

Author: RaphaelRobidas

calcus/settings.py

@@ -218,7 +218,7 @@
 
 WSGI_APPLICATION = "calcus.wsgi.application"
 
-if IS_CLOUD:
+if IS_CLOUD and not IS_TEST:
     DATABASES = {
         "default": {
             "ENGINE": "django_cockroachdb",

frontend/templates/frontend/base.html

@@ -319,7 +319,10 @@
                                 {% if user.is_authenticated %}
                                 <a href="{% url 'frontend:profile' %}"> &nbsp;<strong>My Profile</strong></a>
                                 &nbsp;&nbsp;&nbsp;&nbsp;
-                                <a href="{% url 'logout'%}?next={{request.path}}">Logout <i class="fas fa-sign-out-alt"></i></a>
+                                <form action="{% url 'logout' %}?next={{ request.path }}" method="post">
+                                {% csrf_token %}
+                                <button class="button" type="submit">Logout <i class="fas fa-sign-out-alt"></i></button>
+                                </form>
                                 {% else %}
                                 <a class="button is-primary" href="{% url 'frontend:register' %}">
                                     <strong>Register</strong>

frontend/test_selenium.py

@@ -52,6 +52,39 @@ class InterfaceTests(CalcusLiveServer):
     def test_default_login_page(self):
         self.assertTrue(self.is_on_page_projects())
 
+    def test_logout(self):
+        self.lget("/projects/")
+
+        logout_button = WebDriverWait(self.driver, 5).until(
+            EC.element_to_be_clickable(
+                (
+                    By.XPATH,
+                    "//form[contains(@action, 'logout')]//button[contains(normalize-space(.), 'Logout')]",
+                )
+            )
+        )
+        logout_button.click()
+
+        WebDriverWait(self.driver, 5).until(
+            lambda d: len(
+                d.find_elements(By.XPATH, "//a[contains(normalize-space(.), 'Log in')]")
+            )
+            > 0
+            and len(
+                d.find_elements(
+                    By.XPATH,
+                    "//form[contains(@action, 'logout')]//button[contains(normalize-space(.), 'Logout')]",
+                )
+            )
+            == 0
+        )
+
+        self.lget("/projects/")
+        WebDriverWait(self.driver, 5).until(
+            EC.presence_of_element_located((By.ID, "id_username"))
+        )
+        self.assertIn("/accounts/login/", self.driver.current_url)
+
     def test_goto_projects(self):
         self.lget("/projects/")
         self.assertTrue(self.is_on_page_projects())

frontend/tests/cache/frontend.test_calculations.XtbCalculationTests.test_NEB.input

@@ -1,5 +1,5 @@
 
-!NEB xtb2 --nimages 3
+!NEB xtb2
 *xyz -1 1
 C   -0.74277000   0.14309000   0.12635000
 C    0.71308000  -0.12855000  -0.16358000
@@ -13,8 +13,8 @@ O   -0.91651000   0.74066000   3.00993000
 H   -1.82448000   0.94856000   3.28105000
 *
 %neb
+nimages 3
 product "calc2.xyz"
-nimages 8
 end
 %pal
 nprocs 4

frontend/tests/cache/frontend.test_calculations.XtbCalculationTests.test_NEB/calc.inp

@@ -1,4 +1,4 @@
-!NEB xtb2 --nimages 3
+!NEB xtb2
 *xyz -1 1
 C   -0.74277000   0.14309000   0.12635000
 C    0.71308000  -0.12855000  -0.16358000
@@ -12,8 +12,8 @@ O   -0.91651000   0.74066000   3.00993000
 H   -1.82448000   0.94856000   3.28105000
 *
 %neb
+nimages 3
 product "calc2.xyz"
-nimages 8
 end
 %pal
 nprocs 4