mirror of
https://github.com/apache/superset.git
synced 2026-04-19 08:04:53 +00:00
chore(dao): Organize DAOs according to SIP-92 (#24331)
Co-authored-by: JUST.in DO IT <justin.park@airbnb.com>
This commit is contained in:
@@ -21,7 +21,7 @@ from unittest import mock
|
||||
import pytest
|
||||
|
||||
from superset import db
|
||||
from superset.embedded.dao import EmbeddedDAO
|
||||
from superset.daos.dashboard import EmbeddedDashboardDAO
|
||||
from superset.models.dashboard import Dashboard
|
||||
from tests.integration_tests.base_tests import SupersetTestCase
|
||||
from tests.integration_tests.fixtures.birth_names_dashboard import (
|
||||
@@ -41,7 +41,7 @@ class TestEmbeddedDashboardApi(SupersetTestCase):
|
||||
def test_get_embedded_dashboard(self):
|
||||
self.login("admin")
|
||||
self.dash = db.session.query(Dashboard).filter_by(slug="births").first()
|
||||
self.embedded = EmbeddedDAO.upsert(self.dash, [])
|
||||
self.embedded = EmbeddedDashboardDAO.upsert(self.dash, [])
|
||||
uri = f"api/v1/{self.resource_name}/{self.embedded.uuid}"
|
||||
response = self.client.get(uri)
|
||||
self.assert200(response)
|
||||
|
||||
@@ -19,7 +19,7 @@ import pytest
|
||||
|
||||
import tests.integration_tests.test_app # pylint: disable=unused-import
|
||||
from superset import db
|
||||
from superset.embedded.dao import EmbeddedDAO
|
||||
from superset.daos.dashboard import EmbeddedDashboardDAO
|
||||
from superset.models.dashboard import Dashboard
|
||||
from tests.integration_tests.base_tests import SupersetTestCase
|
||||
from tests.integration_tests.fixtures.world_bank_dashboard import (
|
||||
@@ -28,24 +28,24 @@ from tests.integration_tests.fixtures.world_bank_dashboard import (
|
||||
)
|
||||
|
||||
|
||||
class TestEmbeddedDAO(SupersetTestCase):
|
||||
class TestEmbeddedDashboardDAO(SupersetTestCase):
|
||||
@pytest.mark.usefixtures("load_world_bank_dashboard_with_slices")
|
||||
def test_upsert(self):
|
||||
dash = db.session.query(Dashboard).filter_by(slug="world_health").first()
|
||||
assert not dash.embedded
|
||||
EmbeddedDAO.upsert(dash, ["test.example.com"])
|
||||
EmbeddedDashboardDAO.upsert(dash, ["test.example.com"])
|
||||
assert dash.embedded
|
||||
self.assertEqual(dash.embedded[0].allowed_domains, ["test.example.com"])
|
||||
original_uuid = dash.embedded[0].uuid
|
||||
self.assertIsNotNone(original_uuid)
|
||||
EmbeddedDAO.upsert(dash, [])
|
||||
EmbeddedDashboardDAO.upsert(dash, [])
|
||||
self.assertEqual(dash.embedded[0].allowed_domains, [])
|
||||
self.assertEqual(dash.embedded[0].uuid, original_uuid)
|
||||
|
||||
@pytest.mark.usefixtures("load_world_bank_dashboard_with_slices")
|
||||
def test_get_by_uuid(self):
|
||||
dash = db.session.query(Dashboard).filter_by(slug="world_health").first()
|
||||
uuid = str(EmbeddedDAO.upsert(dash, ["test.example.com"]).uuid)
|
||||
uuid = str(EmbeddedDashboardDAO.upsert(dash, ["test.example.com"]).uuid)
|
||||
db.session.expire_all()
|
||||
embedded = EmbeddedDAO.find_by_id(uuid)
|
||||
embedded = EmbeddedDashboardDAO.find_by_id(uuid)
|
||||
self.assertIsNotNone(embedded)
|
||||
|
||||
@@ -22,7 +22,7 @@ from unittest import mock
|
||||
import pytest
|
||||
|
||||
from superset import db
|
||||
from superset.embedded.dao import EmbeddedDAO
|
||||
from superset.daos.dashboard import EmbeddedDashboardDAO
|
||||
from superset.models.dashboard import Dashboard
|
||||
from tests.integration_tests.fixtures.birth_names_dashboard import (
|
||||
load_birth_names_dashboard_with_slices,
|
||||
@@ -43,7 +43,7 @@ if TYPE_CHECKING:
|
||||
)
|
||||
def test_get_embedded_dashboard(client: FlaskClient[Any]):
|
||||
dash = db.session.query(Dashboard).filter_by(slug="births").first()
|
||||
embedded = EmbeddedDAO.upsert(dash, [])
|
||||
embedded = EmbeddedDashboardDAO.upsert(dash, [])
|
||||
uri = f"embedded/{embedded.uuid}"
|
||||
response = client.get(uri)
|
||||
assert response.status_code == 200
|
||||
@@ -56,7 +56,7 @@ def test_get_embedded_dashboard(client: FlaskClient[Any]):
|
||||
)
|
||||
def test_get_embedded_dashboard_referrer_not_allowed(client: FlaskClient[Any]):
|
||||
dash = db.session.query(Dashboard).filter_by(slug="births").first()
|
||||
embedded = EmbeddedDAO.upsert(dash, ["test.example.com"])
|
||||
embedded = EmbeddedDashboardDAO.upsert(dash, ["test.example.com"])
|
||||
uri = f"embedded/{embedded.uuid}"
|
||||
response = client.get(uri)
|
||||
assert response.status_code == 403
|
||||
|
||||
Reference in New Issue
Block a user