Merge pull request #21040 from jmchilton/25_1_selenium_3

Selenium test for #20886 (sharing private histories)

Author: jmchilton

client/src/components/History/HistoryAccessibility.vue

@@ -44,7 +44,7 @@ function openSharingTab() {
         <BreadcrumbHeading :items="breadcrumbItems" />
 
         <BTabs class="mt-3">
-            <BTab :lazy="historyPrivacyChanged" @click="openSharingTab">
+            <BTab id="history-sharing-tab" :lazy="historyPrivacyChanged" @click="openSharingTab">
                 <template v-slot:title>
                     <FontAwesomeIcon :icon="faShareAlt" class="mr-1" />
                     {{ localize("Share or Publish") }}
@@ -68,7 +68,7 @@ function openSharingTab() {
                 </PortletSection>
             </BTab>
 
-            <BTab :lazy="historyPrivacyChanged" @click="historyPrivacyChanged = false">
+            <BTab id="history-permissions-tab" :lazy="historyPrivacyChanged" @click="historyPrivacyChanged = false">
                 <template v-slot:title>
                     <FontAwesomeIcon :icon="faUserLock" class="mr-1" />
                     {{ localize("Set Permissions") }}
@@ -77,7 +77,7 @@ function openSharingTab() {
                 <HistoryDatasetPermissions :history-id="props.historyId" no-redirect />
             </BTab>
 
-            <BTab>
+            <BTab id="history-make-private-tab">
                 <template v-slot:title>
                     <FontAwesomeIcon :icon="faLock" class="mr-1" />
                     {{ localize("Make Private") }}

client/src/components/History/HistoryMakePrivate.vue

@@ -56,7 +56,12 @@ async function makeHistoryPrivate() {
             re-shared or published. Are you sure you want to do this?
         </p>
 
-        <AsyncButton :icon="faLock" :disabled="!history" variant="primary" :action="makeHistoryPrivate">
+        <AsyncButton
+            data-description="history make private"
+            :icon="faLock"
+            :disabled="!history"
+            variant="primary"
+            :action="makeHistoryPrivate">
             {{ localize("Make History Private") }}
         </AsyncButton>
     </PortletSection>

client/src/components/Sharing/UserSharing.vue

@@ -225,6 +225,7 @@ defineExpose({
             no-close-on-backdrop
             scrollable
             dialog-class="user-sharing-modal"
+            data-description="sharing permissions change required"
             @ok="onUpdatePermissions"
             @cancel="onCancel"
             @close="onCancel">
@@ -250,7 +251,7 @@ defineExpose({
                 header-bg-variant="primary"
                 header-text-variant="white"
                 class="mb-4">
-                <BFormSelect v-model="selectedSharingOption">
+                <BFormSelect v-model="selectedSharingOption" data-description="sharing permissions change required how">
                     <BFormSelectOption value="make_public"> Make datasets public </BFormSelectOption>
                     <BFormSelectOption value="make_accessible_to_shared">
                         Make datasets private to me and users this {{ modelClass }} is shared with

client/src/utils/navigation/navigation.yml

@@ -533,6 +533,12 @@ histories:
       share_with_input: '.share_with_view input'
       make_accessible: '.make-accessible label'
       make_publishable: '.make-publishable label'
+      tab_make_private: '[aria-controls="history-make-private-tab"]'
+      make_private: '[data-description="history make private"]'
+      permissions_change_required: '[data-description="sharing permissions change required"]'
+      permissions_change_required_how: '[data-description="sharing permissions change required how"]'
+      permissions_change_required_ok: '[data-description="sharing permissions change required"] .btn-primary'
+
     labels:
       unshare: 'Unshare'
 

lib/galaxy/selenium/navigates_galaxy.py

@@ -381,6 +381,12 @@ def go_to_workflow_export(self, workflow_id: str) -> None:
     def go_to_history_sharing(self, history_id: str) -> None:
         self.navigate_to(self.build_url(f"histories/sharing?id={history_id}"))
 
+    def make_history_private(self):
+        self.click_history_option_sharing()
+        sharing = self.components.histories.sharing
+        sharing.tab_make_private.wait_for_and_click()
+        sharing.make_private.wait_for_and_click()
+
     def go_to_import_zip(self) -> None:
         self.navigate_to(self.build_url("import/zip"))
         self.components.masthead._.wait_for_visible()

lib/galaxy_test/selenium/test_history_sharing.py

@@ -147,3 +147,54 @@ def test_share_history_login_redirect(self):
         self.fill_login_and_submit(user_email)
         self.wait_for_logged_in()
         self.wait_for_selector(".make-accessible")
+
+
+class TestPrivateHistorySharingRequiresPermissionChanges(SeleniumTestCase):
+    """Test that sharing private histories requires permission changes.
+
+    Includes regression test for PR #20886: When sharing a history containing private datasets
+    with another user, the default option should be "Make datasets private to
+    me and users this history is shared with" rather than "Make datasets public".
+    """
+
+    @selenium_test
+    def test_sharing_private_history_default_permission(self):
+        # Create two test users - one to own the history, one to share with
+        user1_email = self._get_random_email()
+        user2_email = self._get_random_email()
+
+        # Register first user and create a private history with data
+        self.register(user1_email)
+        self.make_history_private()
+        self.perform_upload_of_pasted_content("hello world")
+        self.wait_for_history()
+
+        # Register second user (must exist to share with)
+        self.logout_if_needed()
+        self.register(user2_email)
+        self.logout_if_needed()
+
+        # Login as first user and initiate sharing
+        self.submit_login(user1_email)
+        self.home()
+        self.click_history_option_sharing()
+
+        # Share with the second user - this triggers the permission dialog
+        sharing = self.components.histories.sharing
+        self.share_with_user(sharing, user_email=user2_email)
+
+        # Verify the permission change required dialog appears
+        self.screenshot("history_private_sharing_permissions_dialog")
+        self.components.histories.sharing.permissions_change_required.wait_for_visible()
+
+        # Verify the default selected option is 'make_accessible_to_shared'
+        element = self.components.histories.sharing.permissions_change_required_how.wait_for_visible()
+        default_value = element.get_attribute("value")
+        assert default_value == "make_accessible_to_shared", (
+            f"Expected default permission option to be 'make_accessible_to_shared' "
+            f"(private to shared users), but got '{default_value}'"
+        )
+
+        # Confirm the permission change to complete sharing
+        self.components.histories.sharing.permissions_change_required_ok.wait_for_and_click()
+        self.screenshot("history_private_sharing_permissions_confirmed")