From db4f530a57782ef8bae43fa77fff8ed8c0557c8d Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 8 Mar 2022 11:49:01 -0500
Subject: [PATCH 1/2] Integration test for PDF export.

---
 .github/workflows/integration_selenium.yaml   |  1 +
 client/src/components/Markdown/Markdown.vue   |  4 +--
 lib/galaxy/selenium/navigates_galaxy.py       | 26 +++++++++++++++
 lib/galaxy/selenium/navigation.yml            |  3 +-
 lib/galaxy_test/selenium/test_pages.py        | 21 +-----------
 .../test_pages_pdf_export.py                  | 33 +++++++++++++++++++
 6 files changed, 65 insertions(+), 23 deletions(-)
 create mode 100644 test/integration_selenium/test_pages_pdf_export.py

diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
index 20cbd35f226..8f7afbc5aea 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -13,6 +13,7 @@ env:
   GALAXY_TEST_SELENIUM_RETRIES: 1
   YARN_INSTALL_OPTS: --frozen-lockfile
   GALAXY_CONFIG_SQLALCHEMY_WARN_20: '1'
+  GALAXY_DEPENDENCIES_INSTALL_WEASYPRINT: '1'
 concurrency:
   group: integration-selenium-${{ github.ref }}
   cancel-in-progress: true
diff --git a/client/src/components/Markdown/Markdown.vue b/client/src/components/Markdown/Markdown.vue
index 5ede5d719d6..66b878e2b70 100644
--- a/client/src/components/Markdown/Markdown.vue
+++ b/client/src/components/Markdown/Markdown.vue
@@ -5,7 +5,7 @@
             <div>
                 <b-button
                     v-if="effectiveExportLink"
-                    class="float-right"
+                    class="float-right markdown-pdf-export"
                     title="Download PDF"
                     variant="link"
                     role="button"
@@ -15,7 +15,7 @@
                 </b-button>
                 <b-button
                     v-if="!readOnly"
-                    class="float-right"
+                    class="float-right markdown-edit"
                     title="Edit Markdown"
                     variant="link"
                     role="button"
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 0819a1aac83..58d29565c4b 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -1012,6 +1012,11 @@ class NavigatesGalaxy(HasDriver):
         self.click_masthead_user()
         self.components.masthead.invocations.wait_for_and_click()
 
+    def navigate_to_pages(self):
+        self.home()
+        self.click_masthead_user()
+        self.components.masthead.pages.wait_for_and_click()
+
     def admin_open(self):
         self.components.masthead.admin.wait_for_and_click()
 
@@ -1265,6 +1270,27 @@ class NavigatesGalaxy(HasDriver):
         self.driver.execute_script("arguments[0].scrollIntoView(true);", tool_element)
         tool_link.wait_for_and_click()
 
+    def create_page_and_edit(self, name=None, slug=None, content_format=None, screenshot_name=None):
+        name = self.create_page(name=name, slug=slug, content_format=content_format, screenshot_name=screenshot_name)
+        self.click_grid_popup_option(name, "Edit content")
+        self.components.pages.editor.wym_iframe.wait_for_visible()
+        return name
+
+    def create_page(self, name=None, slug=None, content_format=None, screenshot_name=None):
+        self.components.pages.create.wait_for_and_click()
+        name = name or self._get_random_name(prefix="page")
+        slug = slug = self._get_random_name(prefix="pageslug")
+        content_format = content_format or "HTML"
+        self.tool_set_value("title", name)
+        self.tool_set_value("slug", slug)
+        self.tool_set_value("content_format", content_format, expected_type="select")
+        if screenshot_name:
+            self.screenshot(screenshot_name)
+        # Sometimes 'submit' button not yet hooked up?
+        self.sleep_for(self.wait_types.UX_RENDER)
+        self.components.pages.submit.wait_for_and_click()
+        return name
+
     def tool_parameter_div(self, expanded_parameter_id):
         return self.components.tool_form.parameter_div(parameter=expanded_parameter_id).wait_for_clickable()
 
diff --git a/lib/galaxy/selenium/navigation.yml b/lib/galaxy/selenium/navigation.yml
index 62e5a8fee97..dae911eb35b 100644
--- a/lib/galaxy/selenium/navigation.yml
+++ b/lib/galaxy/selenium/navigation.yml
@@ -442,6 +442,7 @@ pages:
   selectors:
     create: '.manage-table-actions .action-button'
     submit: '#submit'
+    export: '.markdown-pdf-export'
   editor:
     selectors:
       wym_iframe: 'div.wym_iframe iframe'
@@ -450,7 +451,7 @@ pages:
       embed_button: '#embed-galaxy-object'
       dataset_selector: '.saved-datasets'
       embed_dialog_add_button: '.pages-embed .buttons #button-0'
-
+      markdown_editor: '.markdown-textarea'
     labels:
       embed_dataset: 'Embed Dataset'
 
diff --git a/lib/galaxy_test/selenium/test_pages.py b/lib/galaxy_test/selenium/test_pages.py
index 261171a19de..1a6f5cd3d50 100644
--- a/lib/galaxy_test/selenium/test_pages.py
+++ b/lib/galaxy_test/selenium/test_pages.py
@@ -18,22 +18,7 @@ class PagesTestCase(SeleniumTestCase):
         self.history_panel_wait_for_hid_ok(1)
         self.navigate_to_pages()
         self.screenshot("pages_grid")
-
-        self.components.pages.create.wait_for_and_click()
-        name = self._get_random_name(prefix="page")
-        slug = self._get_random_name(prefix="pageslug")
-        self.tool_set_value("title", name)
-        self.tool_set_value("slug", slug)
-        self.tool_set_value("content_format", "HTML", expected_type="select")
-        self.screenshot("pages_create_form")
-
-        # Sometimes 'submit' button not yet hooked up?
-        self.sleep_for(self.wait_types.UX_RENDER)
-
-        self.components.pages.submit.wait_for_and_click()
-
-        self.click_grid_popup_option(name, "Edit content")
-        self.components.pages.editor.wym_iframe.wait_for_visible()
+        name = self.create_page_and_edit(screenshot_name="pages_create_form")
         self.screenshot("pages_editor_new")
         self.driver.switch_to.frame(0)
         try:
@@ -58,7 +43,3 @@ class PagesTestCase(SeleniumTestCase):
         self.navigate_to_pages()
         self.click_grid_popup_option(name, "View")
         self.screenshot("pages_view_simple")
-
-    def navigate_to_pages(self):
-        self.click_masthead_user()  # Open masthead menu
-        self.components.masthead.pages.wait_for_and_click()
diff --git a/test/integration_selenium/test_pages_pdf_export.py b/test/integration_selenium/test_pages_pdf_export.py
new file mode 100644
index 00000000000..5d2dd103261
--- /dev/null
+++ b/test/integration_selenium/test_pages_pdf_export.py
@@ -0,0 +1,33 @@
+from .framework import (
+    selenium_test,
+    SeleniumIntegrationTestCase,
+)
+
+
+class PagesPdfExportSeleniumIntegrationTestCase(SeleniumIntegrationTestCase):
+    ensure_registered = True
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        config["enable_beta_markdown_export"] = True
+
+    @selenium_test
+    def test_history_import_export(self):
+        self.navigate_to_pages()
+        self.screenshot("pages_grid")
+        name = self.create_page(
+            content_format="Markdown",
+        )
+        self.click_grid_popup_option(name, "Edit content")
+        self.components.pages.editor.markdown_editor.wait_for_and_send_keys("moo\n\n\ncow\n\n")
+        self.screenshot("pages_markdown_editor")
+        self.sleep_for(self.wait_types.UX_RENDER)
+        self.screenshot("pages_markdown_editor_content")
+        self.components.pages.editor.save.wait_for_and_click()
+        self.screenshot("pages_markdown_editor_saved")
+        self.sleep_for(self.wait_types.UX_RENDER)
+        self.navigate_to_pages()
+        self.click_grid_popup_option(name, "View")
+        self.screenshot("pages_view_simple")
+        self.components.pages.export.wait_for_and_click()
+        self.sleep_for(self.wait_types.UX_RENDER)

From 72b42f1c2a09967753f3a65ccaf71e0cbaf720c0 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Wed, 9 Mar 2022 09:43:08 -0500
Subject: [PATCH 2/2] Update test/integration_selenium/test_pages_pdf_export.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David López <46503462+davelopez@users.noreply.github.com>
---
 test/integration_selenium/test_pages_pdf_export.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration_selenium/test_pages_pdf_export.py b/test/integration_selenium/test_pages_pdf_export.py
index 5d2dd103261..25ebc874630 100644
--- a/test/integration_selenium/test_pages_pdf_export.py
+++ b/test/integration_selenium/test_pages_pdf_export.py
@@ -12,7 +12,7 @@ class PagesPdfExportSeleniumIntegrationTestCase(SeleniumIntegrationTestCase):
         config["enable_beta_markdown_export"] = True
 
     @selenium_test
-    def test_history_import_export(self):
+    def test_page_pdf_export(self):
         self.navigate_to_pages()
         self.screenshot("pages_grid")
         name = self.create_page(