[superset] 02/02: chore: Merge adjustments

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelsmolina pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 649a0b3fc19c27476fca43497f02b817df52903b
Author: Michael S. Molina <mi...@gmail.com>
AuthorDate: Thu Jan 5 16:03:56 2023 -0500

    chore: Merge adjustments
---
 superset-frontend/src/views/CRUD/data/database/DatabaseList.test.jsx | 2 ++
 tests/unit_tests/conftest.py                                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseList.test.jsx b/superset-frontend/src/views/CRUD/data/database/DatabaseList.test.jsx
index 964adc64d5..b71a13ffeb 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseList.test.jsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseList.test.jsx
@@ -82,6 +82,8 @@ const mockUser = {
   userId: 1,
 };
 
+const userSelectorMock = jest.spyOn(redux, 'useSelector');
+
 fetchMock.get(databasesInfoEndpoint, {
   permissions: ['can_write'],
 });
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
index 43c4ac69ad..7676111ea0 100644
--- a/tests/unit_tests/conftest.py
+++ b/tests/unit_tests/conftest.py
@@ -88,7 +88,7 @@ def client(app: SupersetApp) -> Any:
         yield client
 
 
-@pytest.fixture
+@pytest.fixture(autouse=True)
 def app_context(app: SupersetApp) -> Iterator[None]:
     """
     A fixture that yields and application context.