Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ct 1827/064 column comments tests conversion #6766

Merged
merged 10 commits into from
Jan 31, 2023
Merged

Ct 1827/064 column comments tests conversion #6766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c7fb9a1
Convert test and make it a bit more pytest-onic
VersusFacit Jan 19, 2023
e2fe29b
Ax old integration test.
VersusFacit Jan 19, 2023
7bc1a66
Run black on test conversion
VersusFacit Jan 19, 2023
f74bd5c
I didn't like how pytest was running the fixture so wrapped it into a…
VersusFacit Jan 19, 2023
39df7a8
Merge converted test into persist docs.
VersusFacit Jan 26, 2023
84f5397
Merge branch 'main' into CT-1827/064_column_comments_tests_conversion
VersusFacit Jan 27, 2023
5e8e2aa
Merge branch 'main' into CT-1827/064_column_comments_tests_conversion
VersusFacit Jan 27, 2023
0fd3e3a
Move persist docs tests to the adapter zone. Prep for adapter tests.
VersusFacit Jan 27, 2023
6984636
Fix up test names
VersusFacit Jan 27, 2023
f43cf83
Fix name to be less confusing.
VersusFacit Jan 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...functional/persist_docs_tests/fixtures.py → ...bt/tests/adapter/persist_docs/fixtures.py
View file
Open in desktop
File renamed without changes.
33 changes: 23 additions & 10 deletions ...l/persist_docs_tests/test_persist_docs.py → ...adapter/persist_docs/test_persist_docs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
import os
import pytest

from dbt.tests.util import (
run_dbt,
)
from dbt.tests.util import run_dbt

from tests.functional.persist_docs_tests.fixtures import (
from dbt.tests.adapter.persist_docs.fixtures import (
_DOCS__MY_FUN_DOCS,
_MODELS__MISSING_COLUMN,
_MODELS__MODEL_USING_QUOTE_UTIL,
Expand All @@ -20,7 +18,7 @@
)


class BasePersistDocsTest:
class BasePersistDocsBase:
@pytest.fixture(scope="class", autouse=True)
def setUp(self, project):
run_dbt(["seed"])
Expand Down Expand Up @@ -90,7 +88,7 @@ def _assert_has_view_comments(
assert view_name_comment is None


class TestPersistDocs(BasePersistDocsTest):
class BasePersistDocs(BasePersistDocsBase):
@pytest.fixture(scope="class")
def project_config_update(self):
return {
Expand Down Expand Up @@ -120,7 +118,7 @@ def test_has_comments_pglike(self, project):
self._assert_has_view_comments(no_docs_node, False, False)


class TestPersistDocsColumnMissing(BasePersistDocsTest):
class BasePersistDocsColumnMissing(BasePersistDocsBase):
@pytest.fixture(scope="class")
def project_config_update(self):
return {
Expand All @@ -141,7 +139,7 @@ def models(self):
def properties(self):
return {"schema.yml": _PROPERITES__SCHEMA_MISSING_COL}

def test_postgres_missing_column(self, project):
def test_missing_column(self, project):
run_dbt(["docs", "generate"])
with open("target/catalog.json") as fp:
catalog_data = json.load(fp)
Expand All @@ -152,7 +150,10 @@ def test_postgres_missing_column(self, project):
assert table_id_comment.startswith("test id column description")


class TestPersistDocsColumnComment:
class BasePersistDocsCommentOnQuotedColumn:
"""Covers edge case where column with comment must be quoted.
We set this using the `quote:` tag in the property file."""

@pytest.fixture(scope="class")
def models(self):
return {"quote_model.sql": _MODELS__MODEL_USING_QUOTE_UTIL}
Expand Down Expand Up @@ -190,5 +191,17 @@ def fixt():

return fixt

def test_postgres_comments(self, run_has_comments):
def test_quoted_column_comments(self, run_has_comments):
run_has_comments()


class TestPersistDocs(BasePersistDocs):
pass


class TestPersistDocsColumnMissing(BasePersistDocsColumnMissing):
pass


class TestPersistDocsCommentOnQuotedColumn(BasePersistDocsCommentOnQuotedColumn):
pass