8000 Merge remote-tracking branch 'origin/main' into antocuni/py-terminal · pyscript/pyscript@1867b8b · GitHub
[go: up one dir, main page]
Skip to content

Commit 1867b8b

Browse files
antocuniantocuni
committed
Merge remote-tracking branch 'origin/main' into antocuni/py-terminal
2 parents 89c2124 + fdc35ce commit 1867b8b

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-18
lines changed

‎pyscript.core/tests/integration/support.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,7 @@ def wait_for_pyscript(self, *, timeout=None, check_js_errors=True):
471471
self.logger.log(
472472
"wait_for_pyscript", f"Waited for {elapsed_ms/1000:.2f} s", color="yellow"
473473
)
474-
# We still don't know why this wait is necessary, but without it
475-
# events aren't being triggered in the tests.
476-
self.page.wait_for_timeout(100)
474+
self.page.wait_for_selector("html.all-done")
477475

478476
SCRIPT_TAG_REGEX = re.compi 10000 le('(<script type="py"|<py-script)')
479477

@@ -487,15 +485,15 @@ def _pyscript_format(self, snippet, *, execution_thread, extra_head=""):
487485
<html>
488486
<head>
489487
<link rel="stylesheet" href="{self.http_server_addr}/build/core.css">
490-
<script
491-
type="module"
492-
src="{self.http_server_addr}/build/core.js"
493-
></script>
494488
<script type="module">
489+
import {{ config }} from "{self.http_server_addr}/build/core.js";
490+
globalThis.pyConfig = config.py;
491+
globalThis.mpyConfig = config.mpy;
495492
addEventListener(
496493
'py:all-done',
497494
() => {{
498-
console.debug('---py:all-done---')
495+
console.debug('---py:all-done---');
496+
document.documentElement.classList.add('all-done');
499497
}},
500498
{{ once: true }}
501499
);

‎pyscript.core/tests/integration/test_02_display.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,4 +461,4 @@ def test_image_renders_correctly(self):
461461
)
462462

463463
img_src = self.page.locator("img").get_attribute("src")
464-
assert img_src.startswith('data:image/png;charset=utf-8;base64')
464+
assert img_src.startswith("data:image/png;charset=utf-8;base64")

‎pyscript.core/tests/integration/test_py_config.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ def test_py_config_inline_pyscript(self):
2323
</py-config>
2424
2525
<py-script async>
26-
from pyscript import window, document
27-
promise = await document.currentScript._pyodide.promise
28-
window.console.log("config name:", promise.config.name)
26+
from pyscript import window
27+
window.console.log("config name:", window.pyConfig.name)
2928
</py-script>
3029
"""
3130
)
@@ -40,9 +39,8 @@ def test_py_config_inline_scriptpy(self):
4039
</py-config>
4140
4241
<script type="py" async>
43-
from pyscript import window, document
44-
promise = await document.currentScript._pyodide.promise
45-
window.console.log("config name:", promise.config.name)
42+
from pyscript import window
43+
window.console.log("config name:", window.pyConfig.name)
4644
</script>
4745
"""
4846
)
@@ -59,9 +57,8 @@ def test_py_config_external(self):
5957
<py-config src="pyconfig.toml"></py-config>
6058
6159
<script type="py" async>
62-
from pyscript import window, document
63-
promise = await document.currentScript._pyodide.promise
64-
window.console.log("config name:", promise.config.name)
60+
from pyscript import window
61+
window.console.log("config name:", window.pyConfig.name)
6562
</script>
6663
"""
6764
)

0 commit comments

Comments
 (0)
0