Skip to content

Add explicit pyscript version to create and wrap cmd templates #67

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

Merged
mchilvers merged 9 commits into from
Jan 11, 2023
Merged

Add explicit pyscript version to create and wrap cmd templates #67

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
17be948
add LATEST_PYSCRIPT_VERSION constant
fpliger Jan 11, 2023
e8b3a9e
add pyscript-version parameter to create cmd
fpliger Jan 11, 2023
9677b1e
add pyscript_version parameter on methods that create new app from te…
fpliger Jan 11, 2023
abf333f
add test for new create cmd version argument
fpliger Jan 11, 2023
24a932b
add test for create
fpliger Jan 11, 2023
594915c
add test for wrap cmd
fpliger Jan 11, 2023
acbd25b
add test for pyscript version when calling wrap with file instead of cmd
fpliger Jan 11, 2023
d94bedb
improve tests
fpliger Jan 11, 2023
b0a1d1c
fix typing error
fpliger Jan 11, 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
Prev Previous commit
Next Next commit
improve tests
  • Loading branch information
@fpliger
fpliger committed Jan 11, 2023
commit d94bedb4bc557a5d1eb883c50f8f5deedf9a7766
40 changes: 38 additions & 2 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from mypy_extensions import VarArg
from typer.testing import CliRunner, Result

from pyscript import LATEST_PYSCRIPT_VERSION, __version__
from pyscript import LATEST_PYSCRIPT_VERSION, __version__, config
from pyscript.cli import app

if TYPE_CHECKING:
Expand Down Expand Up @@ -179,21 +179,30 @@ def test_wrap_pyscript_version(
expected_version: str,
tmp_path: Path,
) -> None:
"""
Test that when wrap is called passing a string code input and an explicit pyscript version
the project is created correctly
"""
command = 'print("Hello World!")'
args = ["wrap", "-c", command, "-o", "output.html"]
if version is not None:
args.extend(["--pyscript-version", version])

# GIVEN a call to wrap with a cmd input and specific pyscript version as arguments
result = invoke_cli(*args)
assert result.exit_code == 0

# EXPECT the output file to exist
expected_html_path = tmp_path / "output.html"
assert expected_html_path.exists()

with expected_html_path.open() as fp:
html_text = fp.read()

# EXPECT the right cmd to be present in the output file
assert f"<py-script>\n{command}\n</py-script>" in html_text

# EXPECT the right JS and CSS version to be present in the output file
version_str = (
f'<script defer src="https://pyscript.net/releases/{expected_version}'
'/pyscript.js"></script>'
Expand All @@ -216,6 +225,10 @@ def test_wrap_pyscript_version_file(
expected_version: str,
tmp_path: Path,
) -> None:
"""
Test that when wrap is called passing a file input and an explicit pyscript version
the project is created correctly
"""
command = 'print("Hello World!")'
input_file = tmp_path / "hello.py"
with input_file.open("w") as fp:
Expand All @@ -225,17 +238,22 @@ def test_wrap_pyscript_version_file(

if version is not None:
args.extend(["--pyscript-version", version])

# GIVEN a call to wrap with a file and specific pyscript version as arguments
result = invoke_cli(*args)
assert result.exit_code == 0

# EXPECT the output file to exist
expected_html_path = tmp_path / "output.html"
assert expected_html_path.exists()

with expected_html_path.open() as fp:
html_text = fp.read()

# EXPECT the right cmd to be present in the output file
assert f"<py-script>\n{command}\n</py-script>" in html_text

# EXPECT the right JS and CSS version to be present in the output file
version_str = (
f'<script defer src="https://pyscript.net/releases/{expected_version}'
'/pyscript.js"></script>'
Expand All @@ -261,6 +279,9 @@ def test_create_project_version(
create_args: tuple[str],
expected_version: str,
) -> None:
"""
Test that project created with an explicit pyscript version are created correctly
"""
command = 'print("Hello World!")'

input_file = tmp_path / "hello.py"
Expand All @@ -275,15 +296,22 @@ def test_create_project_version(
"--author-email",
"tester@me.com",
]

# GIVEN a call to wrap with a file and specific pyscript version as arguments
result = invoke_cli("create", *cmd_args)
# breakpoint()
assert result.exit_code == 0

# EXPECT the app folder to exist
expected_app_path = tmp_path / create_args[0]
assert expected_app_path.exists()

# EXPECT the app folder to contain the right index.html file
app_file = expected_app_path / "index.html"
assert app_file.exists()
with app_file.open() as fp:
html_text = fp.read()

# EXPECT the right JS and CSS version to be present in the html file
version_str = (
f'<script defer src="https://pyscript.net/releases/{expected_version}'
'/pyscript.js"></script>'
Expand All @@ -294,3 +322,11 @@ def test_create_project_version(
)
assert version_str in html_text
assert css_version_str in html_text

# EXPECT the folder to also contain the python main file
py_file = expected_app_path / config["project_main_filename"]
assert py_file.exists()

# EXPECT the folder to also contain the config file
config_file = expected_app_path / config["project_config_filename"]
assert config_file.exists()