{{ provider }}
{% endfor %}{{ directory}}
diff --git a/masonite/snippets/scaffold/view.html b/src/masonite/snippets/exceptions/__init__.py similarity index 100% rename from masonite/snippets/scaffold/view.html rename to src/masonite/snippets/exceptions/__init__.py diff --git a/masonite/snippets/exceptions/css/go-icon.png b/src/masonite/snippets/exceptions/css/go-icon.png similarity index 100% rename from masonite/snippets/exceptions/css/go-icon.png rename to src/masonite/snippets/exceptions/css/go-icon.png diff --git a/masonite/snippets/exceptions/css/so-icon.png b/src/masonite/snippets/exceptions/css/so-icon.png similarity index 100% rename from masonite/snippets/exceptions/css/so-icon.png rename to src/masonite/snippets/exceptions/css/so-icon.png diff --git a/masonite/snippets/exceptions/css/style.css b/src/masonite/snippets/exceptions/css/style.css similarity index 100% rename from masonite/snippets/exceptions/css/style.css rename to src/masonite/snippets/exceptions/css/style.css diff --git a/masonite/snippets/exceptions/dump.html b/src/masonite/snippets/exceptions/dump.html similarity index 100% rename from masonite/snippets/exceptions/dump.html rename to src/masonite/snippets/exceptions/dump.html diff --git a/masonite/snippets/exceptions/obj_loop.html b/src/masonite/snippets/exceptions/obj_loop.html similarity index 100% rename from masonite/snippets/exceptions/obj_loop.html rename to src/masonite/snippets/exceptions/obj_loop.html diff --git a/masonite/snippets/migrations/create_failed_jobs_table.py b/src/masonite/snippets/migrations/create_failed_jobs_table.py similarity index 100% rename from masonite/snippets/migrations/create_failed_jobs_table.py rename to src/masonite/snippets/migrations/create_failed_jobs_table.py diff --git a/masonite/snippets/migrations/create_queue_jobs_table.py b/src/masonite/snippets/migrations/create_queue_jobs_table.py similarity index 100% rename from masonite/snippets/migrations/create_queue_jobs_table.py rename to src/masonite/snippets/migrations/create_queue_jobs_table.py diff --git a/masonite/snippets/scaffold/command.html b/src/masonite/snippets/scaffold/command.html similarity index 100% rename from masonite/snippets/scaffold/command.html rename to src/masonite/snippets/scaffold/command.html diff --git a/masonite/snippets/scaffold/controller.html b/src/masonite/snippets/scaffold/controller.html similarity index 100% rename from masonite/snippets/scaffold/controller.html rename to src/masonite/snippets/scaffold/controller.html diff --git a/masonite/snippets/scaffold/controller_resource.html b/src/masonite/snippets/scaffold/controller_resource.html similarity index 100% rename from masonite/snippets/scaffold/controller_resource.html rename to src/masonite/snippets/scaffold/controller_resource.html diff --git a/masonite/snippets/scaffold/job.html b/src/masonite/snippets/scaffold/job.html similarity index 100% rename from masonite/snippets/scaffold/job.html rename to src/masonite/snippets/scaffold/job.html diff --git a/masonite/snippets/scaffold/middleware.html b/src/masonite/snippets/scaffold/middleware.html similarity index 100% rename from masonite/snippets/scaffold/middleware.html rename to src/masonite/snippets/scaffold/middleware.html diff --git a/masonite/snippets/scaffold/model.html b/src/masonite/snippets/scaffold/model.html similarity index 100% rename from masonite/snippets/scaffold/model.html rename to src/masonite/snippets/scaffold/model.html diff --git a/masonite/snippets/scaffold/provider.html b/src/masonite/snippets/scaffold/provider.html similarity index 100% rename from masonite/snippets/scaffold/provider.html rename to src/masonite/snippets/scaffold/provider.html diff --git a/masonite/snippets/scaffold/test.html b/src/masonite/snippets/scaffold/test.html similarity index 100% rename from masonite/snippets/scaffold/test.html rename to src/masonite/snippets/scaffold/test.html diff --git a/masonite/snippets/scaffold/validator.html b/src/masonite/snippets/scaffold/validator.html similarity index 100% rename from masonite/snippets/scaffold/validator.html rename to src/masonite/snippets/scaffold/validator.html diff --git a/src/masonite/snippets/scaffold/view.html b/src/masonite/snippets/scaffold/view.html new file mode 100644 index 000000000..e69de29bb diff --git a/masonite/snippets/statuscode.html b/src/masonite/snippets/statuscode.html similarity index 100% rename from masonite/snippets/statuscode.html rename to src/masonite/snippets/statuscode.html diff --git a/masonite/storage.py b/src/masonite/storage.py similarity index 100% rename from masonite/storage.py rename to src/masonite/storage.py diff --git a/masonite/testing/BaseRequest.py b/src/masonite/testing/BaseRequest.py similarity index 100% rename from masonite/testing/BaseRequest.py rename to src/masonite/testing/BaseRequest.py diff --git a/masonite/testing/MockRoute.py b/src/masonite/testing/MockRoute.py similarity index 98% rename from masonite/testing/MockRoute.py rename to src/masonite/testing/MockRoute.py index 4ee24f581..a9f818434 100644 --- a/masonite/testing/MockRoute.py +++ b/src/masonite/testing/MockRoute.py @@ -1,7 +1,7 @@ -from masonite.request import Request -from masonite.testsuite import TestSuite, generate_wsgi +from ..request import Request +from .generate_wsgi import generate_wsgi import json -from masonite.helpers import Dot +from ..helpers import Dot class MockRoute: diff --git a/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py similarity index 80% rename from masonite/testing/TestCase.py rename to src/masonite/testing/TestCase.py index 8c9f32a91..7131f9808 100644 --- a/masonite/testing/TestCase.py +++ b/src/masonite/testing/TestCase.py @@ -5,13 +5,13 @@ from contextlib import contextmanager from urllib.parse import urlencode -from masonite import env -from masonite.exceptions import RouteNotFoundException -from masonite.helpers.migrations import Migrations -from masonite.helpers.routes import create_matchurl, flatten_routes -from masonite.testsuite import generate_wsgi +from .. import env +from ..exceptions import RouteNotFoundException +from ..helpers.migrations import Migrations +from ..helpers.routes import create_matchurl, flatten_routes +from .generate_wsgi import generate_wsgi +from .create_container import create_container from orator.orm import Factory -from masonite.app import App from .MockRoute import MockRoute @@ -22,11 +22,11 @@ class TestCase(unittest.TestCase): transactions = True refreshes_database = False _transaction = False - _with_subdomains = False def setUp(self): from wsgi import container self.container = container + self._with_subdomains = False self.acting_user = False self.factory = Factory() @@ -228,7 +228,7 @@ def run_container(self, wsgi_values={}): try: for provider in self.container.make('WSGIProviders'): self.container.resolve(provider.boot) - except Exception as e: + except Exception as e: # skipcq if self._exception_handling: self.container.make('ExceptionHandler').load_exception(e) else: @@ -285,42 +285,4 @@ def withoutHttpMiddleware(self): return self def create_container(self): - container = App() - from config import application - from config import providers - - container.bind('WSGI', generate_wsgi()) - container.bind('Application', application) - container.bind('Container', container) - - container.bind('ProvidersConfig', providers) - container.bind('Providers', []) - container.bind('WSGIProviders', []) - - """Bind all service providers - Let's register everything into the Service Container. Once everything is - in the container we can run through all the boot methods. For reasons - some providers don't need to execute with every request and should - only run once when the server is started. Providers will be ran - once if the wsgi attribute on a provider is False. - """ - - for provider in container.make('ProvidersConfig').PROVIDERS: - located_provider = provider() - located_provider.load_app(container).register() - if located_provider.wsgi: - container.make('WSGIProviders').append(located_provider) - else: - container.make('Providers').append(located_provider) - - for provider in container.make('Providers'): - container.resolve(provider.boot) - - """Get the application from the container - Some providers may change the WSGI Server like wrapping the WSGI server - in a Whitenoise container for an example. Let's get a WSGI instance - from the container and pass it to the application variable. This - will allow WSGI servers to pick it up from the command line - """ - - return container + return create_container() diff --git a/src/masonite/testing/__init__.py b/src/masonite/testing/__init__.py new file mode 100644 index 000000000..8a93101d1 --- /dev/null +++ b/src/masonite/testing/__init__.py @@ -0,0 +1,4 @@ +from .TestCase import TestCase +from .MockRoute import MockRoute +from .generate_wsgi import generate_wsgi +from .create_container import create_container diff --git a/src/masonite/testing/create_container.py b/src/masonite/testing/create_container.py new file mode 100644 index 000000000..5b6a918d6 --- /dev/null +++ b/src/masonite/testing/create_container.py @@ -0,0 +1,43 @@ +from ..app import App +import copy + + +def create_container(): + container = copy.deepcopy(App()) + from .generate_wsgi import generate_wsgi + from config import providers + + container.bind('WSGI', generate_wsgi()) + container.bind('Container', container) + + # container.bind('ProvidersConfig', providers) + container.bind('Providers', []) + container.bind('WSGIProviders', []) + + """Bind all service providers + Let's register everything into the Service Container. Once everything is + in the container we can run through all the boot methods. For reasons + some providers don't need to execute with every request and should + only run once when the server is started. Providers will be ran + once if the wsgi attribute on a provider is False. + """ + + for provider in providers.PROVIDERS: + located_provider = provider() + located_provider.load_app(container).register() + if located_provider.wsgi: + container.make('WSGIProviders').append(located_provider) + else: + container.make('Providers').append(located_provider) + + for provider in container.make('Providers'): + container.resolve(provider.boot) + + """Get the application from the container + Some providers may change the WSGI Server like wrapping the WSGI server + in a Whitenoise container for an example. Let's get a WSGI instance + from the container and pass it to the application variable. This + will allow WSGI servers to pick it up from the command line + """ + + return container diff --git a/src/masonite/testing/generate_wsgi.py b/src/masonite/testing/generate_wsgi.py new file mode 100644 index 000000000..e392f085c --- /dev/null +++ b/src/masonite/testing/generate_wsgi.py @@ -0,0 +1,32 @@ + +import io + + +def generate_wsgi(): + return { + 'wsgi.version': (1, 0), + 'wsgi.multithread': False, + 'wsgi.multiprocess': True, + 'wsgi.run_once': False, + 'wsgi.input': io.BytesIO(), + 'SERVER_SOFTWARE': 'gunicorn/19.7.1', + 'REQUEST_METHOD': 'GET', + 'QUERY_STRING': 'application=Masonite', + 'RAW_URI': '/', + 'SERVER_PROTOCOL': 'HTTP/1.1', + 'HTTP_HOST': '127.0.0.1:8000', + 'HTTP_ACCEPT': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', + 'HTTP_UPGRADE_INSECURE_REQUESTS': '1', + 'HTTP_COOKIE': 'setcookie=value', + 'HTTP_USER_AGENT': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/604.4.7 (KHTML, like Gecko) Version/11.0.2 Safari/604.4.7', + 'HTTP_ACCEPT_LANGUAGE': 'en-us', + 'HTTP_ACCEPT_ENCODING': 'gzip, deflate', + 'HTTP_CONNECTION': 'keep-alive', + 'wsgi.url_scheme': 'http', + 'REMOTE_ADDR': '127.0.0.1', + 'REMOTE_PORT': '62241', + 'SERVER_NAME': '127.0.0.1', + 'SERVER_PORT': '8000', + 'PATH_INFO': '/', + 'SCRIPT_NAME': '' + } diff --git a/masonite/view.py b/src/masonite/view.py similarity index 97% rename from masonite/view.py rename to src/masonite/view.py index ad82b8ae7..f6d6fe19f 100644 --- a/masonite/view.py +++ b/src/masonite/view.py @@ -4,10 +4,11 @@ from jinja2 import ChoiceLoader, Environment, PackageLoader, select_autoescape from jinja2.exceptions import TemplateNotFound -from masonite.exceptions import RequiredContainerBindingNotFound, ViewException +from .exceptions import RequiredContainerBindingNotFound, ViewException +from .response import Responsable -class View: +class View(Responsable): """View class. Responsible for handling everything involved with views and view environments.""" _splice = '/' @@ -189,6 +190,7 @@ def add_environment(self, template_location, loader=PackageLoader): Keyword Arguments: loader {jinja2.Loader} -- Type of Jinja2 loader to use. (default: {jinja2.PackageLoader}) """ + # print('loading', template_location) if loader == PackageLoader: template_location = template_location.split(self._splice) @@ -304,3 +306,6 @@ def __get_cached_template(self): def set_splice(self, splice): self._splice = splice return self + + def get_response(self): + return self.rendered_template diff --git a/tests/broadcasts/test_sockets.py b/tests/broadcasts/test_sockets.py index 4ec985cba..b75cd9750 100644 --- a/tests/broadcasts/test_sockets.py +++ b/tests/broadcasts/test_sockets.py @@ -1,35 +1,34 @@ import os -from masonite.drivers import BroadcastPusherDriver -from masonite.managers import BroadcastManager -from masonite.testsuite.TestSuite import TestSuite -import unittest +from src.masonite.drivers import BroadcastPusherDriver +from src.masonite.managers import BroadcastManager +from src.masonite.testing import TestCase if os.getenv('ABLY_SECRET'): - class TestSockets(unittest.TestCase): + class TestSockets(TestCase): def setUp(self): - self.app = TestSuite().create_container().container - self.app.bind('BroadcastPusherDriver', BroadcastPusherDriver) - self.app.bind('BroadcastManager', BroadcastManager) + super().setUp() + self.container.bind('BroadcastPusherDriver', BroadcastPusherDriver) + self.container.bind('BroadcastManager', BroadcastManager) def test_broadcast_loads_into_container(self): - self.app.bind('Broadcast', self.app.make('BroadcastManager').driver('pusher')) + self.container.bind('Broadcast', self.container.make('BroadcastManager').driver('pusher')) - self.assertIsNotNone(self.app.make('BroadcastManager')) - self.assertEqual(self.app.make('Broadcast').channel('random', 'from driver'), {'message': 'from driver'}) - self.assertEqual(self.app.make('Broadcast').channel('random', {'message': 'dictionary'}), {'message': 'dictionary'}) - self.assertEqual(self.app.make('Broadcast').channel(['channel1', 'channel2'], {'message': 'dictionary'}), {'message': 'dictionary'}) - self.assertEqual(self.app.make('Broadcast').channel(['channel1', 'channel2'], {'message': 'dictionary'}, 'test-event'), {'message': 'dictionary'}) - self.assertTrue(self.app.make('Broadcast').ssl(True).ssl_message) + self.assertIsNotNone(self.container.make('BroadcastManager')) + self.assertEqual(self.container.make('Broadcast').channel('random', 'from driver'), {'message': 'from driver'}) + self.assertEqual(self.container.make('Broadcast').channel('random', {'message': 'dictionary'}), {'message': 'dictionary'}) + self.assertEqual(self.container.make('Broadcast').channel(['channel1', 'channel2'], {'message': 'dictionary'}), {'message': 'dictionary'}) + self.assertEqual(self.container.make('Broadcast').channel(['channel1', 'channel2'], {'message': 'dictionary'}, 'test-event'), {'message': 'dictionary'}) + self.assertTrue(self.container.make('Broadcast').ssl(True).ssl_message) def test_broadcast_loads_into_container_with_ably(self): - self.app.bind('Broadcast', self.app.make('BroadcastManager').driver('ably')) - - self.assertIsNotNone(self.app.make('BroadcastManager')) - self.assertEqual(self.app.make('Broadcast').channel('test-channel', 'from driver'), 'from driver') - self.assertEqual(self.app.make('Broadcast').channel('test-channel', {'message': 'from driver'}), {'message': 'from driver'}) - self.assertEqual(self.app.make('Broadcast').channel(['channel-1', 'channel-2'], {'message': 'dictionary'}), {'message': 'dictionary'}) - self.assertEqual(self.app.make('Broadcast').channel(['channel-1', 'channel-2'], {'message': 'dictionary'}, 'test-event'), {'message': 'dictionary'}) - self.assertTrue(self.app.make('Broadcast').ssl(True).ssl_message) + self.container.bind('Broadcast', self.container.make('BroadcastManager').driver('ably')) + + self.assertIsNotNone(self.container.make('BroadcastManager')) + self.assertEqual(self.container.make('Broadcast').channel('test-channel', 'from driver'), 'from driver') + self.assertEqual(self.container.make('Broadcast').channel('test-channel', {'message': 'from driver'}), {'message': 'from driver'}) + self.assertEqual(self.container.make('Broadcast').channel(['channel-1', 'channel-2'], {'message': 'dictionary'}), {'message': 'dictionary'}) + self.assertEqual(self.container.make('Broadcast').channel(['channel-1', 'channel-2'], {'message': 'dictionary'}, 'test-event'), {'message': 'dictionary'}) + self.assertTrue(self.container.make('Broadcast').ssl(True).ssl_message) diff --git a/tests/core/test_app.py b/tests/core/test_app.py index 113b8857b..36db26fd5 100644 --- a/tests/core/test_app.py +++ b/tests/core/test_app.py @@ -1,6 +1,6 @@ -from masonite.app import App -from masonite.request import Request -from masonite.testsuite.TestSuite import generate_wsgi +from src.masonite.app import App +from src.masonite.request import Request +from src.masonite.testing import generate_wsgi import unittest REQUEST = Request({}).load_environ(generate_wsgi()) diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py index 3830d22cf..63a489761 100644 --- a/tests/core/test_auth.py +++ b/tests/core/test_auth.py @@ -1,20 +1,20 @@ import datetime import time -from config import application, auth +from config import application from config.database import Model -from masonite.app import App -from masonite.auth import Auth, MustVerifyEmail, Sign -from masonite.managers import AuthManager -from masonite.drivers import AuthCookieDriver, AuthJwtDriver -from masonite.helpers import password as bcrypt_password -from masonite.routes import Get -from masonite.request import Request -from masonite.snippets.auth.controllers.ConfirmController import \ +from src.masonite.app import App +from src.masonite.auth import Auth, MustVerifyEmail, Sign +from src.masonite.auth.guards import Guard, WebGuard +from src.masonite.drivers import AuthJwtDriver +from src.masonite.helpers import password as bcrypt_password +from src.masonite.routes import Get +from src.masonite.request import Request +from app.http.controllers.ConfirmController import \ ConfirmController -from masonite.testing import TestCase -from masonite.testsuite.TestSuite import generate_wsgi -from masonite.view import View +from src.masonite.testing import TestCase +from src.masonite.testing import generate_wsgi +from src.masonite.view import View class User(Model, MustVerifyEmail): @@ -33,20 +33,19 @@ def setUp(self): self.app = self.container self.app.bind('Container', self.app) view = View(self.container) - self.request = Request(generate_wsgi()) + self.request = Request(generate_wsgi()).load_environ(generate_wsgi()) self.request.key(application.KEY) self.app.bind('Request', self.request) - # self.auth = Auth(self.request, MockUser()) self.container.bind('View', view.render) self.container.bind('ViewClass', view) - self.app.bind('Application', application) - self.app.bind('Auth', Auth) - self.app.bind('AuthConfig', auth) - self.app.bind('AuthManager', AuthManager) - self.app.bind('AuthCookieDriver', AuthCookieDriver) - self.app.bind('AuthJwtDriver', AuthJwtDriver) - - self.auth = self.app.make('Auth', User) + + + self.auth = Guard(self.app) + self.auth.register_guard('web', WebGuard) + self.auth.guard('web').register_driver('jwt', AuthJwtDriver) + self.auth.set('web') + + self.app.swap(Auth, self.auth) self.request.load_app(self.app) def setUpFactories(self): @@ -60,9 +59,9 @@ def setUpFactories(self): def test_auth(self): self.assertTrue(self.auth) - def test_login_user(self): + def test_login_user1(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.assertTrue(self.auth.login('user@email.com', 'secret')) self.assertTrue(self.request.get_cookie('token')) self.assertEqual(self.auth.user().name, 'testuser123') @@ -70,17 +69,16 @@ def test_login_user(self): def test_login_with_no_password(self): with self.assertRaises(TypeError): for driver in ('cookie', 'jwt'): + self.auth.driver(driver) self.auth.driver = driver self.assertTrue(self.auth.login('nopassword@email.com', None)) - # def test_can_login_with_second_password(self): - # self.auth.auth_model.__password__ = 'second_password' - # self.assertTrue(self.auth.login('user@email.com', 'pass123')) - # self.assertTrue(self.request.get_cookie('token')) + def test_guard_switches_guard(self): + self.assertIsInstance(self.auth.guard('web'), WebGuard) def test_login_user_with_list_auth_column(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.auth.auth_model.__auth__ = ['name', 'email'] self.assertTrue(self.auth.login('testuser123', 'secret')) self.assertTrue(self.request.get_cookie('token')) @@ -93,30 +91,31 @@ def test_can_register(self): }) for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.assertTrue(User.where('email', 'joe@email.com').first()) self.assertNotEqual(User.where('email', 'joe@email.com').first().password, 'secret') def test_get_user(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.assertTrue(self.auth.login_by_id(1)) self.assertTrue(self.request.user()) def test_get_user_returns_false_if_not_loggedin(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.auth.login('user@email.com', 'wrong_secret') self.assertFalse(self.auth.user()) def test_logout_user(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.auth.login('user@email.com', 'secret') self.assertTrue(self.request.get_cookie('token')) self.assertTrue(self.auth.user()) self.assertTrue(self.request.user()) - + self.auth.driver('jwt') + self.auth.logout() self.assertFalse(self.request.get_cookie('token')) self.assertFalse(self.auth.user()) @@ -124,34 +123,42 @@ def test_logout_user(self): def test_login_user_fails(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.assertFalse(self.auth.login('user@email.com', 'bad_password')) def test_login_user_success(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.assertTrue(self.auth.login('user@email.com', 'secret')) def test_login_by_id(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.assertTrue(self.auth.login_by_id(1)) self.assertTrue(self.request.get_cookie('token')) self.assertFalse(self.auth.login_by_id(3)) + def test_guard_can_register_new_drivers(self): + self.auth.guard('web').register_driver('api', AuthJwtDriver) + + self.assertIsInstance(self.auth.driver('api'), AuthJwtDriver) + + + def test_guard_can_register_new_guards(self): + self.auth.register_guard('api_guard', AuthJwtDriver) + + self.assertIsInstance(self.auth.guard('api_guard'), AuthJwtDriver) + + def test_login_once_does_not_set_cookie(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) self.assertTrue(self.auth.once().login_by_id(1)) self.assertIsNone(self.request.get_cookie('token')) - # def test_user_is_mustverify_instance(self): - # self.assertIsInstance(self.auth.once().login_by_id(1), MustVerifyEmail) - # self.assertNotIsInstance(self.auth.once().login_by_id(1), MustVerifyEmail) - def test_confirm_controller_success(self): for driver in ('jwt', 'cookie'): - self.auth.driver = driver + self.auth.driver(driver) params = {'id': Sign().sign('{0}::{1}'.format(1, time.time()))} self.request.set_params(params) user = self.auth.once().login_by_id(1) @@ -176,7 +183,7 @@ def test_confirm_controller_success(self): def test_confirm_controller_failure(self): for driver in ('cookie', 'jwt'): - self.auth.driver = driver + self.auth.driver(driver) timestamp_plus_11 = datetime.datetime.now() - datetime.timedelta(minutes=11) params = {'id': Sign().sign('{0}::{1}'.format(1, timestamp_plus_11.timestamp()))} diff --git a/tests/core/test_auth_middleware.py b/tests/core/test_auth_middleware.py new file mode 100644 index 000000000..d41c74b4f --- /dev/null +++ b/tests/core/test_auth_middleware.py @@ -0,0 +1,38 @@ +from src.masonite.auth.guards import WebGuard + +from src.masonite.auth import Auth +from src.masonite.middleware import GuardMiddleware +from src.masonite.routes import Get +from src.masonite.testing import TestCase + +class MockApiGuard: + + def user(self): + return 'user' + +class MockController: + + def user(self, auth: Auth): + return auth.user() + +class TestAuthMiddleware(TestCase): + + def setUp(self): + super().setUp() + self.container.make(Auth).register_guard('api', MockApiGuard) + + self.withRouteMiddleware({ + 'guard': GuardMiddleware, + }) + + self.routes([ + Get('/guard/web', MockController.user).middleware('guard:web'), + Get('/guard/api', MockController.user).middleware('guard:api') + ]) + + def test_can_switch_guards(self): + self.get('/guard/web').assertContains('False') + self.assertIsInstance(self.container.make(Auth).get(), WebGuard) + + self.get('/guard/api').assertContains('user') + self.assertIsInstance(self.container.make(Auth).get(), WebGuard) \ No newline at end of file diff --git a/tests/core/test_autoload.py b/tests/core/test_autoload.py index b19e3cbe6..533cc8be3 100644 --- a/tests/core/test_autoload.py +++ b/tests/core/test_autoload.py @@ -1,10 +1,10 @@ import unittest -from masonite.app import App -from masonite.autoload import Autoload -from masonite.exceptions import (AutoloadContainerOverwrite, ContainerError, +from src.masonite.app import App +from src.masonite.autoload import Autoload +from src.masonite.exceptions import (AutoloadContainerOverwrite, ContainerError, InvalidAutoloadPath) -from masonite.request import Request +from src.masonite.request import Request class TestAutoload(unittest.TestCase): diff --git a/tests/core/test_cache.py b/tests/core/test_cache.py index e549f516a..b5924dde3 100644 --- a/tests/core/test_cache.py +++ b/tests/core/test_cache.py @@ -1,14 +1,13 @@ import glob import os import time - -from config import cache -from masonite.app import App -from masonite.drivers import CacheDiskDriver, CacheRedisDriver -from masonite.environment import LoadEnvironment -from masonite.managers import CacheManager import unittest +from src.masonite.app import App +from src.masonite.drivers import CacheDiskDriver, CacheRedisDriver +from src.masonite.environment import LoadEnvironment +from src.masonite.managers import CacheManager + LoadEnvironment() @@ -16,11 +15,10 @@ class TestCache(unittest.TestCase): def setUp(self): self.app = App() - self.app.bind('CacheConfig', cache) + self.app.bind('Application', self.app) self.app.bind('CacheDiskDriver', CacheDiskDriver) self.app.bind('CacheRedisDriver', CacheRedisDriver) self.app.bind('CacheManager', CacheManager(self.app)) - self.app.bind('Application', self.app) self.app.bind('Cache', self.app.make('CacheManager').driver('disk')) self.drivers = ['disk'] if os.environ.get('REDIS_CACHE_DRIVER'): diff --git a/tests/core/test_compile_sass.py b/tests/core/test_compile_sass.py index 6e780f25a..d5c59beac 100644 --- a/tests/core/test_compile_sass.py +++ b/tests/core/test_compile_sass.py @@ -1,5 +1,5 @@ import os -from masonite.storage import Storage +from src.masonite.storage import Storage import unittest diff --git a/tests/core/test_container.py b/tests/core/test_container.py index d629c6cab..12b90093f 100644 --- a/tests/core/test_container.py +++ b/tests/core/test_container.py @@ -1,8 +1,8 @@ -from masonite.app import App -from masonite.request import Request -from masonite.drivers import UploadDiskDriver -from masonite.contracts import UploadContract -from masonite.exceptions import ContainerError, StrictContainerException +from src.masonite.app import App +from src.masonite.request import Request +from src.masonite.drivers import UploadDiskDriver +from src.masonite.contracts import UploadContract +from src.masonite.exceptions import ContainerError, StrictContainerException import unittest diff --git a/tests/core/test_controllers.py b/tests/core/test_controllers.py index 94ed12b1b..9ab5b093f 100644 --- a/tests/core/test_controllers.py +++ b/tests/core/test_controllers.py @@ -1,7 +1,7 @@ -from masonite.app import App -from masonite.helpers.routes import get +from src.masonite.app import App +from src.masonite.helpers.routes import get from app.http.controllers.ControllerTest import ControllerTest -from masonite.request import Request +from src.masonite.request import Request import unittest diff --git a/tests/core/test_cookie_signing.py b/tests/core/test_cookie_signing.py index 24310e5e6..4d8b6945f 100644 --- a/tests/core/test_cookie_signing.py +++ b/tests/core/test_cookie_signing.py @@ -1,5 +1,5 @@ -from masonite.request import Request -from masonite.testsuite.TestSuite import generate_wsgi +from src.masonite.request import Request +from src.masonite.testing import generate_wsgi import unittest diff --git a/tests/core/test_csrf.py b/tests/core/test_csrf.py index 92db6b3f2..68d426872 100644 --- a/tests/core/test_csrf.py +++ b/tests/core/test_csrf.py @@ -1,6 +1,6 @@ -from masonite.middleware import CsrfMiddleware -from masonite.testing import TestCase -from masonite.routes import Get, Post +from src.masonite.middleware import CsrfMiddleware +from src.masonite.testing import TestCase +from src.masonite.routes import Get, Post class TestCsrf(TestCase): diff --git a/tests/core/test_environment.py b/tests/core/test_environment.py index 225da41ca..befe95b94 100644 --- a/tests/core/test_environment.py +++ b/tests/core/test_environment.py @@ -1,6 +1,6 @@ -from masonite.environment import LoadEnvironment -from masonite import env +from src.masonite.environment import LoadEnvironment +from src.masonite import env import os import unittest diff --git a/tests/core/test_exception.py b/tests/core/test_exception.py index 478c2053a..82ea36836 100644 --- a/tests/core/test_exception.py +++ b/tests/core/test_exception.py @@ -1,10 +1,10 @@ -from masonite.app import App -from masonite.exception_handler import ExceptionHandler -from masonite.hook import Hook -from masonite.request import Request -from masonite.response import Response -from masonite.testsuite.TestSuite import generate_wsgi -from masonite.view import View +from src.masonite.app import App +from src.masonite.exception_handler import ExceptionHandler +from src.masonite.hook import Hook +from src.masonite.request import Request +from src.masonite.response import Response +from src.masonite.testing import generate_wsgi +from src.masonite.view import View import unittest @@ -29,7 +29,6 @@ class TestException(unittest.TestCase): def setUp(self): self.app = App() - self.app.bind('Application', ApplicationMock) self.app.bind('Environ', generate_wsgi()) self.app.bind('WebRoutes', []) self.app.bind('View', View(self.app).render) @@ -40,6 +39,7 @@ def setUp(self): self.app.bind('ExceptionHandler', ExceptionHandler(self.app)) self.app.bind('HookHandler', Hook(self.app)) self.app.bind('Request', Request(generate_wsgi()).load_app(self.app)) + self.app.bind('staticfiles', {}) self.app.bind('ExceptionAttributeErrorHandler', MockExceptionHandler) def test_exception_renders_view(self): @@ -61,5 +61,5 @@ def test_custom_exception_when_not_registered(self): self.app.make('ExceptionHandler').load_exception(e) def test_exception_returns_none_when_debug_is_false(self): - self.app.make('Application').DEBUG = False + # config('application.debug') = False self.assertIsNone(self.app.make('ExceptionHandler').load_exception(KeyError)) diff --git a/tests/core/test_extends.py b/tests/core/test_extends.py index f15e1dbb2..b96923a17 100644 --- a/tests/core/test_extends.py +++ b/tests/core/test_extends.py @@ -1,7 +1,7 @@ -from masonite.app import App -from masonite.testsuite.TestSuite import generate_wsgi -from masonite.routes import Route -from masonite.request import Request +from src.masonite.app import App +from src.masonite.testing import generate_wsgi +from src.masonite.routes import Route +from src.masonite.request import Request wsgi_request = generate_wsgi() import unittest diff --git a/tests/core/test_hook.py b/tests/core/test_hook.py index 5d57d78cc..0c7b46e60 100644 --- a/tests/core/test_hook.py +++ b/tests/core/test_hook.py @@ -1,5 +1,5 @@ -from masonite.app import App -from masonite.hook import Hook +from src.masonite.app import App +from src.masonite.hook import Hook import unittest diff --git a/tests/core/test_mail_log_drivers.py b/tests/core/test_mail_log_drivers.py index 7043ded88..e65a3274d 100644 --- a/tests/core/test_mail_log_drivers.py +++ b/tests/core/test_mail_log_drivers.py @@ -1,16 +1,14 @@ -from config import mail import os - -from masonite.app import App -from masonite.view import View -from masonite.managers.MailManager import MailManager -from masonite.drivers import MailLogDriver -from masonite.drivers import MailTerminalDriver -import unittest import sys +import unittest from contextlib import contextmanager + from _io import StringIO +from src.masonite.app import App +from src.masonite.drivers import MailLogDriver, MailTerminalDriver +from src.masonite.managers.MailManager import MailManager +from src.masonite.view import View @contextmanager @@ -35,7 +33,6 @@ def setUp(self): self.app = self.app.bind('Container', self.app) self.app.bind('Test', object) - self.app.bind('MailConfig', mail) viewClass = View(self.app) self.app.bind('ViewClass', viewClass) self.app.bind('View', viewClass.render) diff --git a/tests/core/test_mail_smtp_driver.py b/tests/core/test_mail_smtp_driver.py index 0a9d4908a..e3027d6a7 100644 --- a/tests/core/test_mail_smtp_driver.py +++ b/tests/core/test_mail_smtp_driver.py @@ -1,11 +1,10 @@ -from config import mail -from masonite import env -from masonite.app import App -from masonite.drivers import MailMailgunDriver as Mailgun -from masonite.drivers import MailSmtpDriver as MailDriver -from masonite.environment import LoadEnvironment -from masonite.managers.MailManager import MailManager -from masonite.view import View +from src.masonite import env +from src.masonite.app import App +from src.masonite.drivers import MailMailgunDriver as Mailgun +from src.masonite.drivers import MailSmtpDriver as MailDriver +from src.masonite.environment import LoadEnvironment +from src.masonite.managers.MailManager import MailManager +from src.masonite.view import View import unittest LoadEnvironment() @@ -22,7 +21,6 @@ def setUp(self): self.app.bind('Container', self.app) self.app.bind('Test', object) - self.app.bind('MailConfig', mail) self.app.bind('MailSmtpDriver', MailDriver) self.app.bind('MailMailgunDriver', Mailgun) viewClass = View(self.app) diff --git a/tests/core/test_mailgun_driver.py b/tests/core/test_mailgun_driver.py index 51422eedc..821e43dfd 100644 --- a/tests/core/test_mailgun_driver.py +++ b/tests/core/test_mailgun_driver.py @@ -1,15 +1,14 @@ import os - -from config import mail -from masonite import env -from masonite.app import App -from masonite.drivers import MailMailgunDriver as Mailgun -from masonite.drivers import MailSmtpDriver as MailDriver -from masonite.environment import LoadEnvironment -from masonite.managers.MailManager import MailManager -from masonite.view import View import unittest +from src.masonite import env +from src.masonite.app import App +from src.masonite.drivers import MailMailgunDriver as Mailgun +from src.masonite.drivers import MailSmtpDriver as MailDriver +from src.masonite.environment import LoadEnvironment +from src.masonite.managers.MailManager import MailManager +from src.masonite.view import View + LoadEnvironment() if os.getenv('MAILGUN_SECRET'): @@ -24,7 +23,6 @@ def setUp(self): self.app.bind('Container', self.app) self.app.bind('Test', object) - self.app.bind('MailConfig', mail) self.app.bind('MailSmtpDriver', MailDriver) self.app.bind('MailMailgunDriver', Mailgun) viewClass = View(self.app) diff --git a/tests/core/test_managers_mail_manager.py b/tests/core/test_managers_mail_manager.py index 41ff1ff52..fbfc5a3b1 100644 --- a/tests/core/test_managers_mail_manager.py +++ b/tests/core/test_managers_mail_manager.py @@ -1,17 +1,16 @@ -from masonite.environment import LoadEnvironment +from src.masonite.environment import LoadEnvironment LoadEnvironment() -from config import mail -from masonite.app import App -from masonite.contracts import MailManagerContract -from masonite.drivers import MailMailgunDriver as Mailgun -from masonite.drivers import MailSmtpDriver as MailDriver -from masonite.exceptions import DriverNotFound -from masonite.managers import MailManager -from masonite.view import View -from masonite.contracts import MailContract -from masonite import env +from src.masonite.app import App +from src.masonite.contracts import MailManagerContract +from src.masonite.drivers import MailMailgunDriver as Mailgun +from src.masonite.drivers import MailSmtpDriver as MailDriver +from src.masonite.exceptions import DriverNotFound +from src.masonite.managers import MailManager +from src.masonite.view import View +from src.masonite.contracts import MailContract +from src.masonite import env import unittest @@ -36,7 +35,6 @@ def setUp(self): self.app.bind('Test', object) self.app.bind('MailSmtpDriver', object) - self.app.bind('MailConfig', mail) self.app.bind('View', View(self.app).render) self.app.bind('ViewClass', View(self.app)) diff --git a/tests/core/test_middleware.py b/tests/core/test_middleware.py index 39395e8bf..f2aa82dda 100644 --- a/tests/core/test_middleware.py +++ b/tests/core/test_middleware.py @@ -1,8 +1,8 @@ -from masonite.request import Request -from masonite.routes import Get +from src.masonite.request import Request +from src.masonite.routes import Get from app.http.middleware.TestMiddleware import TestMiddleware as MiddlewareTest from app.http.middleware.TestHttpMiddleware import TestHttpMiddleware as MiddlewareHttpTest -from masonite.testing import TestCase +from src.masonite.testing import TestCase class MiddlewareValueTest: diff --git a/tests/core/test_package.py b/tests/core/test_package.py index 67a56aba3..247be2530 100644 --- a/tests/core/test_package.py +++ b/tests/core/test_package.py @@ -1,7 +1,7 @@ import os import unittest -from masonite.packages import (create_controller, create_or_append_config) +from src.masonite.packages import (create_controller, create_or_append_config) PACKAGE_DIRECTORY = os.getcwd() diff --git a/tests/core/test_providers.py b/tests/core/test_providers.py index 55b26fb00..65109ec7a 100644 --- a/tests/core/test_providers.py +++ b/tests/core/test_providers.py @@ -1,39 +1,32 @@ -from config import application, providers -from masonite.app import App -from masonite.routes import Get -from masonite.testsuite.TestSuite import TestSuite, generate_wsgi -import unittest +from src.masonite.helpers import config +from src.masonite.routes import Get +from src.masonite.testing import TestCase, generate_wsgi -class TestProviders(unittest.TestCase): +class TestProviders(TestCase): def setUp(self): - self.app = App(remember=False) - self.app.bind('WSGI', object) - - self.app.bind('Application', application) - self.app.bind('Providers', providers) - self.app.bind('Environ', generate_wsgi()) + super().setUp() + self.container.bind('Environ', generate_wsgi()) def test_providers_load_into_container(self): - for provider in self.app.make('Providers').PROVIDERS: - provider().load_app(self.app).register() + for provider in config('providers.providers'): + provider().load_app(self.container).register() - self.app.bind('Response', 'test') - self.app.bind('WebRoutes', [ + self.container.bind('Response', 'test') + self.container.bind('WebRoutes', [ Get().route('url', 'TestController@show'), Get().route('url/', 'TestController@show'), Get().route('url/@firstname', 'TestController@show'), ]) - self.app.bind('Response', 'Route not found. Error 404') + self.container.bind('Response', 'Route not found. Error 404') - for provider in self.app.make('Providers').PROVIDERS: - self.app.resolve(provider().load_app(self.app).boot) + for provider in config('providers.providers'): + self.container.resolve(provider().load_app(self.container).boot) - self.assertTrue(self.app.make('Request')) + self.assertTrue(self.container.make('Request')) def test_normal_app_containers(self): - self.app = TestSuite().create_container() - self.assertTrue(self.app.get_container().make('Request')) + self.assertTrue(self.container.make('Request')) diff --git a/tests/core/test_request_routes.py b/tests/core/test_request_routes.py index 5287b8978..fcef310bb 100644 --- a/tests/core/test_request_routes.py +++ b/tests/core/test_request_routes.py @@ -1,13 +1,12 @@ -from masonite.routes import Get, Post -from masonite.request import Request -from masonite.testsuite.TestSuite import TestSuite, generate_wsgi -import unittest +from src.masonite.routes import Get, Post +from src.masonite.testing import TestCase, generate_wsgi -class TestRequestRoutes(unittest.TestCase): +class TestRequestRoutes(TestCase): def setUp(self): - self.request = Request(generate_wsgi()).key( + super().setUp() + self.request = self.container.make('Request').load_environ(generate_wsgi()).key( 'NCTpkICMlTXie5te9nJniMj9aVbPM6lsjeq5iDZ0dqY=') self.request.activate_subdomains() @@ -57,38 +56,36 @@ def test_method_type_has_required_subdomain(self): self.assertEqual(post.has_required_domain(), True) def test_method_type_has_required_subdomain_with_asterick(self): - container = TestSuite().create_container() - request = container.container.make('Request') + - request.environ['HTTP_HOST'] = 'test.localhost:8000' + self.request.environ['HTTP_HOST'] = 'test.localhost:8000' - request.activate_subdomains() + self.request.activate_subdomains() get = Get().domain('*') post = Get().domain('*') - get.request = request - post.request = request + get.request = self.request + post.request = self.request self.assertEqual(get.has_required_domain(), True) self.assertEqual(post.has_required_domain(), True) def test_request_sets_subdomain_on_get(self): - container = TestSuite().create_container() - request = container.container.make('Request') + - request.environ['HTTP_HOST'] = 'test.localhost:8000' + self.request.environ['HTTP_HOST'] = 'test.localhost:8000' - request.activate_subdomains() + self.request.activate_subdomains() get = Get().domain('*') post = Get().domain('*') - get.request = request - post.request = request + get.request = self.request + post.request = self.request get.has_required_domain() - self.assertEqual(request.param('subdomain'), 'test') + self.assertEqual(self.request.param('subdomain'), 'test') def test_route_changes_module_location(self): get = Get().module('app.test') diff --git a/tests/core/test_requests.py b/tests/core/test_requests.py index 69ffe6020..76ac5c42b 100644 --- a/tests/core/test_requests.py +++ b/tests/core/test_requests.py @@ -2,17 +2,17 @@ from cgi import MiniFieldStorage import pytest -from masonite.app import App -from masonite.exceptions import InvalidHTTPStatusCode, RouteException -from masonite.helpers.routes import flatten_routes -from masonite.helpers.time import cookie_expire_time -from masonite.request import Request -from masonite.response import Response -from masonite.routes import Get, RouteGroup -from masonite.testsuite.TestSuite import generate_wsgi from app.http.test_controllers.TestController import TestController -from config import application, providers +from src.masonite.app import App +from src.masonite.exceptions import InvalidHTTPStatusCode, RouteException +from src.masonite.helpers import config +from src.masonite.helpers.routes import flatten_routes +from src.masonite.helpers.time import cookie_expire_time +from src.masonite.request import Request +from src.masonite.response import Response +from src.masonite.routes import Get, RouteGroup +from src.masonite.testing import generate_wsgi WEB_ROUTES = flatten_routes([ Get('/test', 'Controller@show').name('test'), @@ -88,7 +88,7 @@ def test_request_input_can_get_dictionary_elements(self): ] } } - self.assertEqual(self.request.input('user.address.*.id'), [1,2]) + self.assertEqual(self.request.input('user.address.*.id'), [1, 2]) self.assertEqual(self.request.input('user.address.*.street'), ['A Street', 'B Street']) def test_request_sets_and_gets_cookies(self): @@ -179,12 +179,10 @@ def test_request_loads_app(self): def test_request_gets_input_from_container(self): container = App() - container.bind('Application', application) - container.bind('Providers', providers) container.bind('WSGI', object) container.bind('Environ', wsgi_request) - for provider in container.make('Providers').PROVIDERS: + for provider in config('providers.providers'): provider().load_app(container).register() container.bind('Response', 'test') @@ -196,7 +194,7 @@ def test_request_gets_input_from_container(self): container.bind('Response', 'Route not found. Error 404') - for provider in container.make('Providers').PROVIDERS: + for provider in config('providers.providers'): located_provider = provider().load_app(container) container.resolve(located_provider.boot) diff --git a/tests/core/test_responsable.py b/tests/core/test_responsable.py new file mode 100644 index 000000000..c485bcf59 --- /dev/null +++ b/tests/core/test_responsable.py @@ -0,0 +1,14 @@ +from src.masonite.testing import TestCase +from src.masonite.routes import Get + + +class TestResponsable(TestCase): + + def setUp(self): + super().setUp() + self.routes(only=[ + Get('/test/mail', 'TestController@mail') + ]) + + def test_mail_can_respond(self): + self.assertTrue(self.get('/test/mail').contains('mail')) diff --git a/tests/core/test_response.py b/tests/core/test_response.py index a56d8b132..7dbda8927 100644 --- a/tests/core/test_response.py +++ b/tests/core/test_response.py @@ -1,20 +1,15 @@ -import unittest -import json -from orator import Model +from orator import LengthAwarePaginator, Model, Paginator from orator.support.collection import Collection -from orator import Paginator, LengthAwarePaginator -from app.User import User + from app.http.controllers.TestController import \ TestController as ControllerTest -from masonite.app import App -from masonite.request import Request -from masonite.response import Response -from masonite.testsuite import generate_wsgi -from masonite.view import View -from masonite.testing import TestCase -from masonite.routes import Get +from app.User import User from config.factories import factory +from src.masonite.response import Response +from src.masonite.routes import Get +from src.masonite.testing import TestCase +from src.masonite.view import View class MockUser(Model): @@ -179,7 +174,6 @@ def test_view_should_return_a_json_response_when_returning_length_aware_paginato def test_view_should_return_a_json_response_when_returning_paginator_instance(self): - users = User.all() ( self.get('/paginator') .assertHasJson('count', 10) diff --git a/tests/core/test_routes.py b/tests/core/test_routes.py index b9fd06765..8fd4a39e4 100644 --- a/tests/core/test_routes.py +++ b/tests/core/test_routes.py @@ -1,17 +1,17 @@ -import unittest -from masonite.exceptions import RouteNotFoundException -from masonite.app import App -from masonite.exceptions import InvalidRouteCompileException, RouteException -from masonite.helpers.routes import create_matchurl, flatten_routes, group -from masonite.request import Request -from masonite.routes import (Connect, Delete, Get, Head, Match, Options, Patch, - Post, Put, Redirect, Route, RouteGroup, Trace) -from masonite.testing import TestCase -from masonite.testsuite.TestSuite import generate_wsgi +import unittest from app.http.controllers.subdirectory.SubController import SubController - +from src.masonite.app import App +from src.masonite.exceptions import (InvalidRouteCompileException, + RouteException) +from src.masonite.helpers.routes import create_matchurl, flatten_routes, group +from src.masonite.request import Request +from src.masonite.routes import (Connect, Delete, Get, Head, Match, Options, + Patch, Post, Put, Redirect, Route, RouteGroup, + Trace) +from src.masonite.testing import TestCase, generate_wsgi +from src.masonite.exceptions import RouteNotFoundException class TestRoutes(unittest.TestCase): diff --git a/tests/core/test_service_provider.py b/tests/core/test_service_provider.py index a69faefa9..3c8643036 100644 --- a/tests/core/test_service_provider.py +++ b/tests/core/test_service_provider.py @@ -1,10 +1,9 @@ import os -import unittest -from masonite.provider import ServiceProvider -from masonite.request import Request -from masonite.routes import Get -from masonite.testsuite.TestSuite import TestSuite, generate_wsgi +from src.masonite.provider import ServiceProvider +from src.masonite.request import Request +from src.masonite.routes import Get +from src.masonite.testing import TestCase, generate_wsgi class ContainerTest(ServiceProvider): @@ -19,7 +18,7 @@ def testboot(self, request: Request, get: Get): class ServiceProviderTest(ServiceProvider): def register(self): - self.app.bind('Request', object) + self.container.bind('Request', object) class Mock1Command: @@ -61,60 +60,60 @@ def boot(self): self.commands(Mock1Command(), Mock2Command()) -class TestServiceProvider(unittest.TestCase): +class TestServiceProvider(TestCase): def setUp(self): - self.app = TestSuite().create_container().container - self.app.resolve_parameters = True + super().setUp() + self.container.resolve_parameters = True self.provider = ServiceProvider() - self.provider.load_app(self.app).register() + self.provider.load_app(self.container).register() self.load_provider = LoadProvider() - self.load_provider.load_app(self.app).boot() + self.load_provider.load_app(self.container).boot() def test_service_provider_loads_app(self): - self.assertEqual(self.provider.app, self.app) + self.assertEqual(self.provider.app, self.container) def test_can_call_container_with_self_parameter(self): - self.app.bind('Request', Request({})) - self.app.bind('Get', Get()) + self.container.bind('Request', Request({})) + self.container.bind('Get', Get()) - self.assertEqual(self.app.resolve(ContainerTest().boot), self.app.make('Request')) + self.assertEqual(self.container.resolve(ContainerTest().boot), self.container.make('Request')) def test_can_call_container_with_annotations_from_variable(self): request = Request(generate_wsgi()) - self.app.bind('Request', request) - self.app.bind('Get', Get().route('url', None)) + self.container.bind('Request', request) + self.container.bind('Get', Get().route('url', None)) - self.assertEqual(self.app.resolve(ContainerTest().testboot), self.app.make('Request')) + self.assertEqual(self.container.resolve(ContainerTest().testboot), self.container.make('Request')) def test_can_load_routes_into_container(self): - self.assertTrue(len(self.app.make('WebRoutes')) > 2) - self.assertEqual(self.app.make('WebRoutes')[-2:], [ROUTE1, ROUTE2]) + self.assertTrue(len(self.container.make('WebRoutes')) > 2) + self.assertEqual(self.container.make('WebRoutes')[-2:], [ROUTE1, ROUTE2]) def test_can_load_http_middleware_into_container(self): - self.assertEqual(self.app.make('HttpMiddleware')[-2:], [object, object]) + self.assertEqual(self.container.make('HttpMiddleware')[-2:], [object, object]) def test_can_load_route_middleware_into_container(self): - self.assertEqual(self.app.make('RouteMiddleware')['route1'], object) - self.assertEqual(self.app.make('RouteMiddleware')['route2'], object) + self.assertEqual(self.container.make('RouteMiddleware')['route1'], object) + self.assertEqual(self.container.make('RouteMiddleware')['route2'], object) def test_can_load_migrations_into_container(self): - self.assertEqual(len(self.app.collect('*MigrationDirectory')), 2) + self.assertEqual(len(self.container.collect('*MigrationDirectory')), 12) def test_can_load_assets_into_container(self): - self.assertEqual(self.app.make('Storage').STATICFILES['storage/static'], '/some/location') + self.assertEqual(self.container.make('staticfiles')['storage/static'], '/some/location') def test_can_load_commands_into_container(self): - self.assertTrue(self.app.make('Mock1Command')) - self.assertTrue(self.app.make('Mock2Command')) + self.assertTrue(self.container.make('Mock1Command')) + self.assertTrue(self.container.make('Mock2Command')) def test_can_load_publishing(self): self.load_provider.publishes({ 'from/directory': 'to/directory' }) self.assertEqual(self.load_provider._publishes, {'from/directory': 'to/directory'}) - # self.assertTrue(self.app.make('Mock2Command')) + # self.assertTrue(self.container.make('Mock2Command')) def test_provider_can_publish_with_tags(self): self.load_provider.publishes({ diff --git a/tests/core/test_session.py b/tests/core/test_session.py index 0ccabd158..3231c2634 100644 --- a/tests/core/test_session.py +++ b/tests/core/test_session.py @@ -1,28 +1,20 @@ -from config import session -from masonite.app import App -from masonite.drivers import SessionCookieDriver, SessionMemoryDriver -from masonite.managers import SessionManager -from masonite.request import Request -from masonite.testsuite.TestSuite import generate_wsgi -import unittest +from src.masonite.drivers import SessionCookieDriver, SessionMemoryDriver +from src.masonite.managers import SessionManager +from src.masonite.testing import generate_wsgi, TestCase -class TestSession(unittest.TestCase): +class TestSession(TestCase): def setUp(self): - wsgi_request = generate_wsgi() - self.app = App() - self.app.bind('Environ', wsgi_request) - self.app.bind('Request', Request(wsgi_request)) - self.app.bind('SessionConfig', session) - self.app.bind('SessionCookieDriver', SessionCookieDriver) - self.app.bind('SessionMemoryDriver', SessionMemoryDriver) - self.app.bind('SessionManager', SessionManager(self.app)) - self.app.bind('Application', self.app) + super().setUp() + self.container.make('Request').load_environ(generate_wsgi()) + self.container.bind('SessionMemoryDriver', SessionMemoryDriver) + self.container.bind('SessionCookieDriver', SessionCookieDriver) + self.container.bind('SessionManager', SessionManager(self.container)) def test_session_request(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session.set('username', 'pep') session.set('password', 'secret') self.assertEqual(session.get('username'), 'pep') @@ -30,22 +22,22 @@ def test_session_request(self): def test_session_has_no_data(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session._session = {} session._flash = {} self.assertFalse(session.has('nodata')) def test_change_ip_address(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) - session.environ['REMOTE_ADDR'] = '111.222.33.44' + session = self.container.make('SessionManager').driver(driver) + session.request.environ['REMOTE_ADDR'] = '111.222.33.44' session.set('username', 'pep') self.assertEqual(session.get('username'), 'pep') def test_session_get_all_data(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) - session.environ['REMOTE_ADDR'] = 'get.all.data' + session = self.container.make('SessionManager').driver(driver) + session.request.environ['REMOTE_ADDR'] = 'get.all.data' session.set('username', 'pep') session.flash('password', 'secret') @@ -53,7 +45,7 @@ def test_session_get_all_data(self): def test_session_has_data(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session._session = {} session._flash = {} session.set('username', 'pep') @@ -62,7 +54,7 @@ def test_session_has_data(self): def test_session_helper(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session._session = {} session._flash = {} helper = session.helper @@ -71,7 +63,7 @@ def test_session_helper(self): def test_session_flash_data(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session._session = {} session.flash('flash_username', 'pep') session.flash('flash_password', 'secret') @@ -79,13 +71,13 @@ def test_session_flash_data(self): self.assertEqual(session.get('flash_password'), 'secret') def test_reset_flash_session_memory(self): - session = self.app.make('SessionManager').driver('memory') + session = self.container.make('SessionManager').driver('memory') session.flash('flash_', 'test_pep') session.reset(flash_only=True) self.assertIsNone(session.get('flash_')) def test_reset_flash_session_driver(self): - session = self.app.make('SessionManager').driver('cookie') + session = self.container.make('SessionManager').driver('cookie') session.flash('flash_', 'test_pep') session.reset(flash_only=True) @@ -93,7 +85,7 @@ def test_reset_flash_session_driver(self): def test_session_flash_data_serializes_dict(self): for driver in ('cookie', 'memory'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session._session = {} session.flash('flash_dict', {'id': 1}) session.set('get_dict', {'id': 1}) @@ -102,21 +94,21 @@ def test_session_flash_data_serializes_dict(self): def test_session_flash_data_serializes_list(self): for driver in ('cookie', 'memory'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session._session = {} session.flash('flash_dict', [1, 2, 3]) self.assertEqual(session.get('flash_dict'), [1, 2, 3]) def test_reset_serializes_dict(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session.set('flash_', 'test_pep') session.reset() self.assertIsNone(session.get('reset_username')) def test_delete_session(self): for driver in ('memory', 'cookie'): - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) session.set('test1', 'value') session.set('test2', 'value') self.assertTrue(session.delete('test1')) @@ -125,12 +117,12 @@ def test_delete_session(self): def test_can_redirect_with_inputs(self): for driver in ('memory', 'cookie'): - request = self.app.make('Request') + request = self.container.make('Request') request.request_variables = { 'key1': 'val1', 'key2': 'val2', } request.with_input() - session = self.app.make('SessionManager').driver(driver) + session = self.container.make('SessionManager').driver(driver) self.assertFalse(session.has('key1')) self.assertFalse(session.has('key2')) diff --git a/tests/core/test_signing.py b/tests/core/test_signing.py index 772a1ebf5..197e67e91 100644 --- a/tests/core/test_signing.py +++ b/tests/core/test_signing.py @@ -2,8 +2,8 @@ from cryptography.fernet import Fernet -from masonite.auth.Sign import Sign -from masonite.exceptions import InvalidSecretKey +from src.masonite.auth.Sign import Sign +from src.masonite.exceptions import InvalidSecretKey class TestSigning(unittest.TestCase): diff --git a/tests/core/test_testsuite.py b/tests/core/test_testsuite.py deleted file mode 100644 index bf57d0ba5..000000000 --- a/tests/core/test_testsuite.py +++ /dev/null @@ -1,19 +0,0 @@ -from masonite.testsuite.TestSuite import TestSuite -import unittest - - -class TestTestSuite(unittest.TestCase): - - def setUp(self): - self.suite = TestSuite().create_container() - self.container = self.suite.get_container() - - def test_testsuite_creates_container(self): - self.assertTrue(self.container.make('Request')) - - def test_testsuite_should_return_route_exists(self): - self.assertTrue(self.suite.route('/test').exists()) - - def test_testsuite_route_should_return_bool_if_has_middleware(self): - self.assertTrue(self.suite.route('/test').hasMiddleware('auth')) - self.assertFalse(self.suite.route('/test').hasMiddleware('none')) diff --git a/tests/core/test_upload_manager.py b/tests/core/test_upload_manager.py index c02bcd03c..35f7340a2 100644 --- a/tests/core/test_upload_manager.py +++ b/tests/core/test_upload_manager.py @@ -2,14 +2,13 @@ import shutil import unittest -from config import application, storage -from masonite.app import App -from masonite.drivers import UploadDiskDriver, UploadS3Driver -from masonite.environment import LoadEnvironment -from masonite.exceptions import (DriverNotFound, FileTypeException, +from src.masonite.app import App +from src.masonite.drivers import UploadDiskDriver, UploadS3Driver +from src.masonite.environment import LoadEnvironment +from src.masonite.exceptions import (DriverNotFound, FileTypeException, UnacceptableDriverType) -from masonite.helpers import static -from masonite.managers.UploadManager import UploadManager +from src.masonite.helpers import static +from src.masonite.managers.UploadManager import UploadManager LoadEnvironment() @@ -35,10 +34,9 @@ def setUp(self): self.app = App() self.app.bind('Container', self.app) self.app.bind('Test', object) - self.app.bind('StorageConfig', storage) + # self.app.bind('StorageConfig', storage) self.app.bind('UploadDiskDriver', UploadDiskDriver) self.app.bind('UploadS3Driver', UploadS3Driver) - self.app.bind('Application', application) self.app.bind('UploadManager', UploadManager) def test_upload_manager_grabs_drivers(self): @@ -64,7 +62,7 @@ def test_upload_manager_changes_accepted_files(self): def test_upload_manager_raises_driver_not_found_error(self): self.app = App() self.app.bind('Test', object) - self.app.bind('StorageConfig', storage) + # self.app.bind('StorageConfig', storage) with self.assertRaises(DriverNotFound): self.assertIsNone(self.app.bind( @@ -168,8 +166,7 @@ def setUp(self): self.app = App() self.app.bind('Container', self.app) - self.app.bind('Application', application) - self.app.bind('StorageConfig', storage) + # self.app.bind('StorageConfig', storage) self.app.bind('UploadDiskDriver', UploadDiskDriver) self.app.bind('UploadManager', UploadManager(self.app)) self.app.bind('Upload', UploadManager(self.app)) diff --git a/tests/core/test_view.py b/tests/core/test_view.py index 05c6d77e7..27dedd4e8 100644 --- a/tests/core/test_view.py +++ b/tests/core/test_view.py @@ -3,12 +3,11 @@ from jinja2 import FileSystemLoader -from config import cache -from masonite.app import App -from masonite.drivers import CacheDiskDriver -from masonite.exceptions import RequiredContainerBindingNotFound, ViewException -from masonite.managers.CacheManager import CacheManager -from masonite.view import View +from src.masonite.app import App +from src.masonite.drivers import CacheDiskDriver +from src.masonite.exceptions import RequiredContainerBindingNotFound, ViewException +from src.masonite.managers.CacheManager import CacheManager +from src.masonite.view import View import unittest @@ -167,7 +166,7 @@ def _filter_slug(item): def test_view_cache_caches_files(self): - self.container.bind('CacheConfig', cache) + # self.container.bind('CacheConfig', cache) self.container.bind('CacheDiskDriver', CacheDiskDriver) self.container.bind('CacheManager', CacheManager(self.container)) self.container.bind('Application', self.container) @@ -197,7 +196,7 @@ def test_view_cache_caches_files(self): self.assertEqual(view('test_cache', {'test': 'macho'}).cache_for('1', 'second').rendered_template, 'macho') def test_cache_throws_exception_with_incorrect_cache_type(self): - self.container.bind('CacheConfig', cache) + # self.container.bind('CacheConfig', cache) self.container.bind('CacheDiskDriver', CacheDiskDriver) self.container.bind('CacheManager', CacheManager(self.container)) self.container.bind('Application', self.container) diff --git a/tests/database/test_user.py b/tests/database/test_user.py index 73fcdef57..56f9d4bfc 100644 --- a/tests/database/test_user.py +++ b/tests/database/test_user.py @@ -1,6 +1,6 @@ """Example Database Testcase.""" -from masonite.testing import TestCase +from src.masonite.testing import TestCase from app.User import User from config.factories import factory diff --git a/tests/helpers/test_clean_request_input.py b/tests/helpers/test_clean_request_input.py index c871fb074..838a274d5 100644 --- a/tests/helpers/test_clean_request_input.py +++ b/tests/helpers/test_clean_request_input.py @@ -1,7 +1,7 @@ import cgi import unittest -from masonite.helpers import clean_request_input +from src.masonite.helpers import clean_request_input class TestCleanRequestInput(unittest.TestCase): diff --git a/tests/helpers/test_collect.py b/tests/helpers/test_collect.py index 82a570f83..e8a8c7843 100644 --- a/tests/helpers/test_collect.py +++ b/tests/helpers/test_collect.py @@ -1,4 +1,4 @@ -from masonite.helpers import collect +from src.masonite.helpers import collect class TestCollect: diff --git a/tests/helpers/test_compact.py b/tests/helpers/test_compact.py index 3290b147f..522d96356 100644 --- a/tests/helpers/test_compact.py +++ b/tests/helpers/test_compact.py @@ -1,6 +1,6 @@ -from masonite.helpers import compact -from masonite.request import Request -from masonite.exceptions import AmbiguousError +from src.masonite.helpers import compact +from src.masonite.request import Request +from src.masonite.exceptions import AmbiguousError import unittest diff --git a/tests/helpers/test_config.py b/tests/helpers/test_config.py index 2330090b0..0dbf7f611 100644 --- a/tests/helpers/test_config.py +++ b/tests/helpers/test_config.py @@ -1,7 +1,7 @@ import unittest -from masonite.helpers import Dot, config +from src.masonite.helpers import Dot, config from config import database diff --git a/tests/helpers/test_dot_notation.py b/tests/helpers/test_dot_notation.py index 3d5f5dab5..9d6000beb 100644 --- a/tests/helpers/test_dot_notation.py +++ b/tests/helpers/test_dot_notation.py @@ -1,6 +1,6 @@ import unittest -from masonite.helpers import dot, Dot as DictDot +from src.masonite.helpers import dot, Dot as DictDot class TestDot(unittest.TestCase): diff --git a/tests/helpers/test_filesystem.py b/tests/helpers/test_filesystem.py index fd27f3cdb..f42df0c72 100644 --- a/tests/helpers/test_filesystem.py +++ b/tests/helpers/test_filesystem.py @@ -1,6 +1,6 @@ import shutil -from masonite.helpers.filesystem import make_directory +from src.masonite.helpers.filesystem import make_directory import unittest diff --git a/tests/helpers/test_instead_of.py b/tests/helpers/test_instead_of.py index 6a4f7f10f..3c8ede614 100644 --- a/tests/helpers/test_instead_of.py +++ b/tests/helpers/test_instead_of.py @@ -1,4 +1,4 @@ -from masonite.request import Request +from src.masonite.request import Request import unittest diff --git a/tests/helpers/test_optional.py b/tests/helpers/test_optional.py index 3d3d86c70..abbf85fc4 100644 --- a/tests/helpers/test_optional.py +++ b/tests/helpers/test_optional.py @@ -1,4 +1,4 @@ -from masonite.helpers import optional +from src.masonite.helpers import optional import unittest diff --git a/tests/helpers/test_password.py b/tests/helpers/test_password.py index d78223606..97188a3f0 100644 --- a/tests/helpers/test_password.py +++ b/tests/helpers/test_password.py @@ -1,4 +1,4 @@ -from masonite.helpers import password +from src.masonite.helpers import password import unittest diff --git a/tests/helpers/test_view_helpers.py b/tests/helpers/test_view_helpers.py index ef7b7f9ae..14f936664 100644 --- a/tests/helpers/test_view_helpers.py +++ b/tests/helpers/test_view_helpers.py @@ -1,11 +1,11 @@ import unittest -from masonite.app import App -from masonite.providers import HelpersProvider -from masonite.request import Request -from masonite.testsuite import generate_wsgi -from masonite.view import View +from src.masonite.app import App +from src.masonite.providers import HelpersProvider +from src.masonite.request import Request +from src.masonite.testing import generate_wsgi +from src.masonite.view import View class TestViewHelpers(unittest.TestCase): diff --git a/tests/listeners/test_exception_listener.py b/tests/listeners/test_exception_listener.py index ae21c4f91..d8579aefa 100644 --- a/tests/listeners/test_exception_listener.py +++ b/tests/listeners/test_exception_listener.py @@ -1,6 +1,6 @@ -from masonite.testing import TestCase -from masonite.request import Request -from masonite.listeners import BaseExceptionListener +from src.masonite.testing import TestCase +from src.masonite.request import Request +from src.masonite.listeners import BaseExceptionListener from routes.web import ROUTES class ExceptionListener(BaseExceptionListener): diff --git a/tests/middleware/test_cors_middleware.py b/tests/middleware/test_cors_middleware.py index 6897c9a4f..99fb5c854 100644 --- a/tests/middleware/test_cors_middleware.py +++ b/tests/middleware/test_cors_middleware.py @@ -1,18 +1,16 @@ -from masonite.middleware import CorsMiddleware -from masonite.request import Request -from masonite.testsuite import generate_wsgi, TestSuite +from src.masonite.middleware import CorsMiddleware +from src.masonite.request import Request +from src.masonite.testing import generate_wsgi, TestCase -import unittest -class TestCorsMiddleware(unittest.TestCase): +class TestCorsMiddleware(TestCase): def setUp(self): - self.request = Request(generate_wsgi()) - self.middleware = CorsMiddleware(self.request) - self.app = TestSuite().create_container().container - self.app.bind('Request', self.request.load_app(self.app)) - self.request = self.app.make('Request') + super().setUp() + self.container.bind('Request', Request(generate_wsgi()).load_app(self.container)) + self.request = self.container.make('Request') + self.middleware = self.container.resolve(CorsMiddleware) def test_secure_headers_middleware(self): self.middleware.CORS = {"Access-Control-Allow-Origin": "*"} diff --git a/tests/middleware/test_csrf_middleware.py b/tests/middleware/test_csrf_middleware.py index dbdcb1f7f..5918c18e3 100644 --- a/tests/middleware/test_csrf_middleware.py +++ b/tests/middleware/test_csrf_middleware.py @@ -1,80 +1,68 @@ -from masonite.request import Request -from masonite.view import View -from masonite.auth.Csrf import Csrf -from masonite.app import App -from masonite.middleware import CsrfMiddleware -from masonite.testsuite.TestSuite import generate_wsgi -from masonite.exceptions import InvalidCSRFToken -from masonite.routes import Get, Route -import unittest +from src.masonite.middleware import CsrfMiddleware +from src.masonite.exceptions import InvalidCSRFToken +from src.masonite.routes import Get, Post +from src.masonite.testing import TestCase -class TestCSRFMiddleware(unittest.TestCase): +class TestCSRFMiddleware(TestCase): def setUp(self): - self.app = App() - wsgi = generate_wsgi() - self.request = Request(wsgi) - self.route = Route().load_environ(wsgi) - self.view = View(self.app) - self.app.bind('Request', self.request) - - self.request = self.app.make('Request') - self.app.bind('WebRoutes', [ - Get().route('/test/@route', None), - Get().route('/test/10', None), + super().setUp() + self.buildOwnContainer() + self.middleware = CsrfMiddleware + self.withHttpMiddleware([ + self.middleware, + ]) + self.routes(only=[ + Post('/test/@route', 'TestController@show'), + Get('/test/10', 'TestController@show'), + Post('/', 'TestController@show'), ]) - self.request.container = self.app - self.middleware = CsrfMiddleware(self.request, Csrf(self.request), self.view) + self.withCsrf() def test_middleware_shares_correct_input(self): - self.middleware.before() - self.assertIn('csrf_field', self.view._shared) - self.assertTrue(self.view._shared['csrf_field'].startswith("