From c1819efe4541c7c2b86db8a87dbb3e689eccd21e Mon Sep 17 00:00:00 2001 From: Joseph Mancuso Date: Sat, 8 Jun 2019 00:00:53 -0400 Subject: [PATCH] fixed placement of test env --- masonite/environment.py | 6 +++--- tests/testing/test_route_tests.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/masonite/environment.py b/masonite/environment.py index 76a0a88b0..52c95f6fa 100644 --- a/masonite/environment.py +++ b/masonite/environment.py @@ -19,9 +19,6 @@ def __init__(self, env=None, override=True, only=None): from dotenv import load_dotenv self.env = load_dotenv - if "pytest" in sys.modules: - self._load_environment('testing', override=override) - if only: self._load_environment(only, override=override) return @@ -34,6 +31,9 @@ def __init__(self, env=None, override=True, only=None): 'APP_ENV'), override=override) if env: self._load_environment(env, override=override) + + if "pytest" in sys.modules: + self._load_environment('testing', override=override) def _load_environment(self, env, override=False): """Load the environment depending on the env file. diff --git a/tests/testing/test_route_tests.py b/tests/testing/test_route_tests.py index aeed66582..95e92400c 100644 --- a/tests/testing/test_route_tests.py +++ b/tests/testing/test_route_tests.py @@ -58,5 +58,5 @@ def test_patch(self): def test_csrf(self): self.with_csrf() - with self.assertRaises(InvalidCSRFToken) as context: + with self.assertRaises(InvalidCSRFToken): self.assertTrue(self.post('/unit/test/json', {'test': 'testing'}).contains('testing'))