Insert testdb.sql as raw SQL.

[philipp/winterrodeln/wradmin.git] / tests / test_wradmin.py
diff --git a/tests/test_wradmin.py b/tests/test_wradmin.py

index a4417015db79785d2d2bb0826656c0bc75a77d79..eb8a9ccf5d2e9306f0a120f90672850f70c4e18d 100644 (file)
--- a/tests/test_wradmin.py
+++ b/tests/test_wradmin.py
@@ -50,7 +50,7 @@ class TestDbWradmin(WradminTestBase):
              with open('tests/testdb.sql', 'r') as f:
                  sql = f.read()
              with wradmin.model.meta.engine.begin() as con:
-                con.execute(sql)
+                con.execution_options(no_parameters=True).execute(sql)
  
                  # update dates
                  seconds_diff, = con.execute("SELECT TIMESTAMPDIFF(SECOND, '2017-03-31 07:00', now())").fetchone()
@@ -63,7 +63,7 @@ class TestDbWradmin(WradminTestBase):
                  con.execute("UPDATE wrreport SET delete_date = delete_date + INTERVAL %s SECOND", (seconds_diff,))
  
      def login(self):
-        return self.app.post('/login', data={'user': 'john', 'password': 'doe'})
+        return self.app.post('/login', data={'user_name': 'Johndoe', 'password': 'doejohn'}, follow_redirects=True)
  
      def login_and_get(self, url: str):
          result = self.app.get(url)
@@ -90,9 +90,11 @@ class TestDbWradmin(WradminTestBase):
      def test_bericht_change_date_invalid_twoweeks(self):
          url = '/bericht/change_date_invalid/19591'
          post_data = {'date_invalid': 'two_weeks', 'date_userdefined': '2018-01-30 18:26'}
-        result = self.app.post(url, data=post_data, follow_redirects=True)
+        result = self.app.post(url, data=post_data)
          self.assertEqual(result.status_code, 302)
-        self.login()
+        result = self.app.post(url, data=post_data, follow_redirects=True)
+        self.assertEqual(result.status_code, 200)
+        result = self.login()
          self.assertEqual(result.status_code, 200)
          result = self.app.post(url, data=post_data, follow_redirects=True)
          self.assertEqual(result.status_code, 200)
@@ -102,6 +104,7 @@ class TestDbWradmin(WradminTestBase):
          self.assertIn('Datum wurde erfolgreich geändert', str(soup))
  
      def test_bericht_change_date_invalid_userdefined(self):
+        self.login()
          post_data = {'date_invalid': 'userdefined', 'date_userdefined': '2018-01-30 15:09'}
          result = self.app.post('/bericht/change_date_invalid/19591', data=post_data, follow_redirects=True)
          self.assertEqual(result.status_code, 200)
@@ -158,7 +161,6 @@ class TestDbWradmin(WradminTestBase):
  
      def test_rodelbahn_view(self):
          result = self.app.get('/rodelbahn/view/926')
-        self.assertEqual(result.status_code, 200)
          self.assertTrue(result.data.startswith(b'<!doctype html'))
          soup = bs4.BeautifulSoup(result.data, 'html.parser')
          self.assertIn('Rodelbahn', soup.title.text)