Merge branch 'master' of https://github.com/MasoniteFramework/core

masonite/request.py

@@ -11,7 +11,7 @@
 import re
 from cgi import MiniFieldStorage
 from http import cookies
-from urllib.parse import parse_qsl
+from urllib.parse import parse_qsl, urlencode
 
 import tldextract
 from cryptography.fernet import InvalidToken
@@ -649,6 +649,10 @@ def redirect(self, route=None, params={}, name=None, controller=None, status=302
         self.status(status)
         return self
 
+    def then_back(self, url=None):
+        self.redirect_url = self.redirect_url + '?' + urlencode({'back': url or self.path}, safe='/')
+        return self
+
     def redirect_to(self, route_name, params={}, status=302):
         """Redirect to a named route.
 

masonite/testing/TestCase.py

@@ -1,6 +1,5 @@
 import io
 import json
-import subprocess
 import unittest
 from contextlib import contextmanager
 from urllib.parse import urlencode
@@ -198,3 +197,19 @@ def withCsrf(self):
 
     def withoutCsrf(self):
         self._with_csrf = False
+
+    def assertDatabaseHas(self, schema, value):
+        from config.database import DB
+
+        table = schema.split('.')[0]
+        column = schema.split('.')[1]
+
+        self.assertTrue(DB.table(table).where(column, value).first())
+
+    def assertDatabaseNotHas(self, schema, value):
+        from config.database import DB
+
+        table = schema.split('.')[0]
+        column = schema.split('.')[1]
+
+        self.assertFalse(DB.table(table).where(column, value).first())

tests/core/test_requests.py

@@ -1,6 +1,5 @@
 import unittest
 from cgi import MiniFieldStorage
-from pydoc import locate
 
 import pytest
 from masonite.app import App
@@ -684,3 +683,16 @@ def test_request_gets_input_with_dotdict(self):
         self.assertEqual(self.request.input('key.user'), '1')
         self.assertEqual(self.request.input('key.nothing'), False)
         self.assertEqual(self.request.input('key.nothing', default='test'), 'test')
+
+    def test_then_back(self):
+        self.request.redirect('/login')
+        self.assertEqual(self.request.redirect_url, '/login')
+
+        self.request.redirect('/login').then_back('/dashboard')
+
+        self.assertEqual(self.request.redirect_url, '/login?back=/dashboard')
+
+        self.request.path = '/dashboard'
+        self.request.redirect('/login').then_back()
+
+        self.assertEqual(self.request.redirect_url, '/login?back=/dashboard')

tests/testing/test_route_tests.py

@@ -61,7 +61,7 @@ def test_json(self):
     def test_json_response(self):
         self.assertTrue(self.json('GET', '/unit/test/json/response').hasJson('count', 5))
 
-    def test_json_response(self):
+    def test_json_response_dictionary(self):
         self.assertTrue(self.json('GET', '/unit/test/json/response').hasJson({
             'count': 5
         }))
@@ -95,3 +95,7 @@ def test_csrf(self):
         self.withCsrf()
         with self.assertRaises(InvalidCSRFToken):
             self.assertTrue(self.post('/unit/test/json', {'test': 'testing'}).contains('testing'))
+
+    def test_database_has(self):
+        self.assertDatabaseHas('users.email', 'user@example.com')
+        self.assertDatabaseNotHas('users.email', 'joe@example.com')