Updating tests

Author: elnelson575

tests/playwright/shiny/bugs/2061-css-js-inclusion/app.py

@@ -2,13 +2,24 @@
 
 from shiny import App, Inputs, Outputs, Session, ui
 
-js_file = Path(__file__).parent / "js" / "customjs.js"
-css_file = Path(__file__).parent / "css" / "style.css"
+custom_css = ui.include_css(
+    Path(__file__).parent / "css" / "style.css",
+    method="link_files",
+)
+
+custom_js = ui.include_js(
+    Path(__file__).parent / "js" / "customjs.js",
+    method="link_files",
+)
+
+# path where the JS file's parent directory is mounted
+href = custom_js.get_dependencies()[0].source_path_map()["href"]
 
 # Define the UI
 app_ui = ui.page_fluid(
-    ui.include_css(css_file, method="link_files"),
-    ui.include_js(js_file, method="link_files"),
+    custom_css,
+    custom_js,
+    ui.tags.script(src=href + "/customjs2.js"),
     ui.h1("Simple Shiny App with External CSS"),
     ui.div(
         ui.p("This is a simple Shiny app that demonstrates ui.include_css()"),

tests/playwright/shiny/bugs/2061-css-js-inclusion/css/style.css

@@ -1,5 +1,3 @@
-@import url("./evenmorecss/more.css");
-
 body {
   font-family: Arial, sans-serif;
 }
@@ -17,5 +15,3 @@ h1 {
   border-radius: 5px;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
 }
-
-

tests/playwright/shiny/bugs/2061-css-js-inclusion/include_files_case/app.py

@@ -1,4 +1,3 @@
 const newParagraph = document.createElement('p');
 newParagraph.textContent = 'Heyo!';
 document.body.appendChild(newParagraph);
-

tests/playwright/shiny/bugs/2061-css-js-inclusion/include_files_case/css/evenmorecss/more.css

@@ -6,4 +6,5 @@
 def test_inclusion(page: Page, local_app: ShinyAppProc) -> None:
     page.goto(local_app.url)
 
-    expect(page.locator("body > p")).to_have_text("Heyo!")
+    expect(page.locator("body > p").first).to_have_text("Heyo!")
+    expect(page.locator("body > p").last).to_have_text("Also here!")

tests/playwright/shiny/bugs/2061-css-js-inclusion/include_files_case/css/style.css

@@ -1,3 +1,4 @@
 const newParagraph = document.createElement('p');
 newParagraph.textContent = 'Heyo!';
 document.body.appendChild(newParagraph);
+