From 602c56c10247e7859255f51d82c95db6db10a733 Mon Sep 17 00:00:00 2001
From: Akanksha Bankhele <bankheleakanksha@gmail.com>
Date: Wed, 5 Nov 2025 09:01:04 -0500
Subject: [PATCH 1/3] high priority test cases

---
 app/assets/javascripts/select_all.js          |   9 +
 app/views/_user_util_links.html.erb           |   4 +-
 .../admin/collections/_cdl_form.html.erb      |  14 +-
 app/views/admin/collections/show.html.erb     |   2 +-
 app/views/bookmarks/merge.html.erb            |   2 +-
 app/views/bookmarks/move.html.erb             |   4 +-
 .../bookmarks/update_access_control.html.erb  |   2 +-
 app/views/checkouts/_return_all.html.erb      |   8 +
 app/views/checkouts/index.html.erb            |  41 ++
 .../media_objects/_access_control.html.erb    |   2 +-
 .../media_objects/_destroy_checkout.html.erb  |   2 +-
 .../modules/_autocomplete_input.html.erb      |   3 +-
 spec/cypress/integration/cdl_spec.js          | 246 +++++++
 spec/cypress/integration/media_object_spec.js | 621 ++++++++++++++++++
 spec/cypress/integration/selected_items.js    | 411 ++++++++++++
 15 files changed, 1354 insertions(+), 17 deletions(-)
 create mode 100644 spec/cypress/integration/cdl_spec.js
 create mode 100644 spec/cypress/integration/selected_items.js

diff --git a/app/assets/javascripts/select_all.js b/app/assets/javascripts/select_all.js
index df6bae8558..7da01d0665 100644
--- a/app/assets/javascripts/select_all.js
+++ b/app/assets/javascripts/select_all.js
@@ -84,3 +84,12 @@ window.addEventListener('beforeunload', function () {
     selectAllAbortController.abort();
   }
 });
+
+//adding data-testid to select toggles for testing
+$(function () {
+  $('label.toggle-bookmark input.toggle-bookmark[type=checkbox]').each(function () {
+    const m = this.id && this.id.match(/^toggle-bookmark_(.+)$/);
+    $(this).attr('data-testid', m ? `bookmark-toggle-${m[1]}` : 'bookmark-toggle');
+  });
+});
+
diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb
index 7b27935d2a..10ff8506b9 100644
--- a/app/views/_user_util_links.html.erb
+++ b/app/views/_user_util_links.html.erb
@@ -37,7 +37,7 @@ Unless required by applicable law or agreed to in writing, software distributed
     <li class="nav-item <%= active_for_controller('checkouts') %>">
       <%= link_to main_app.checkouts_path, id:'checkouts_nav', class: 'nav-link' do %>
         Checkouts
-        (<span data-role='checkout-counter'><%= Checkout.active_for_user(current_or_guest_user.id).count %></span>)
+        (<span data-role='checkout-counter' data-testid='checkout-counter'><%= Checkout.active_for_user(current_or_guest_user.id).count %></span>)
       <% end %>
     </li>
     <% end %>
@@ -46,7 +46,7 @@ Unless required by applicable law or agreed to in writing, software distributed
   <li class="nav-item <%= active_for_controller('bookmarks') %>">
     <%= link_to main_app.bookmarks_path, id:'bookmarks_nav', class: 'nav-link' do %>
       <%= t('blacklight.header_links.bookmarks') %>
-      (<span data-role='bookmark-counter'><%= current_or_guest_user.bookmarks.count %></span>)
+      (<span data-role='bookmark-counter' data-testid='bookmark-counter'><%= current_or_guest_user.bookmarks.count %></span>)
     <% end %>
   </li>
   <% end %>
diff --git a/app/views/admin/collections/_cdl_form.html.erb b/app/views/admin/collections/_cdl_form.html.erb
index 4c08c08c90..1988b4ed44 100644
--- a/app/views/admin/collections/_cdl_form.html.erb
+++ b/app/views/admin/collections/_cdl_form.html.erb
@@ -16,7 +16,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 <% if can?(:update_access_control, object) %>
 <%= bootstrap_form_for object, html: { id: 'cdl_form' }  do |vid| %>
   <% if Avalon::Configuration.controlled_digital_lending_enabled? && object.is_a?(Admin::Collection) %>
-    <div class="card enable-cdl">
+    <div class="card enable-cdl" data-testid="collection-enable-cdl-card">
       <div class="card-header">
         <h3 class="card-title">Controlled Digital Lending </h3>
       </div>
@@ -24,13 +24,13 @@ Unless required by applicable law or agreed to in writing, software distributed
         <div class="mb-3">
           <div class="form-check">
             <%= label_tag :cdl do %>
-            <%= check_box_tag :cdl, '1', (cdl) %>
+            <%= check_box_tag :cdl, '1', (cdl), data: { testid: 'cdl-enable-checkbox' }%>
             Enable controlled digital lending for this collection
             <% end %>
           </div>
         </div>
         <%= hidden_field_tag :save_field, "cdl" %>
-        <%= submit_tag "Save Setting", class: "btn btn-primary", form: 'cdl_form' %>
+        <%= submit_tag "Save Setting", class: "btn btn-primary", form: 'cdl_form', data:{testid: 'cdl-save-setting'} %>
       </div>
     </div>
   <% end %>
@@ -38,7 +38,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 <%= bootstrap_form_for object, html: { id: 'lending_form' }  do |vid| %>
   <% if lending_enabled?(object) %>
-    <div class="card item-lending-period">
+    <div class="card item-lending-period" data-testid="collection-item-lending-period-card">
       <div class="card-header">
         <h3 class="card-title">Item lending period</h3>
       </div>
@@ -51,7 +51,7 @@ Unless required by applicable law or agreed to in writing, software distributed
               <label class="col-form-label" for="add_lending_period_days">
                 <span data-title="Days">Days</span>
               </label>
-              <%= text_field_tag "add_lending_period_days", d ? d : 0, class: 'form-control' %>
+              <%= text_field_tag "add_lending_period_days", d ? d : 0, class: 'form-control' , data: { testid: 'add-lending-period-days' }%>
             </div>
             <div class="col-1">
               <label class="col-form-label" for="add_lending_period_hours">
@@ -63,8 +63,8 @@ Unless required by applicable law or agreed to in writing, software distributed
         </div>
         <%= hidden_field_tag :save_field, "lending_period" %>
         <%= hidden_field_tag :overwrite, false %>
-        <%= submit_tag "Save Setting", class: "btn btn-primary", form: 'lending_form' %>
-        <%= submit_tag "Apply to All Existing Items", name: "apply_to_existing", class: "btn btn-outline", data: { confirm: I18n.t('access_control.apply_to_all_warning') % [object.media_objects.count] }, form: 'lending_form' %>
+        <%= submit_tag "Save Setting", class: "btn btn-primary", form: 'lending_form', data:{testid: 'lending-period-save-setting'}%>
+        <%= submit_tag "Apply to All Existing Items", name: "apply_to_existing", class: "btn btn-outline", data: { confirm: I18n.t('access_control.apply_to_all_warning') % [object.media_objects.count], testid: 'lending-period-apply-to-all' }, form: 'lending_form' %>
       </div>
     </div>
   <% end %>
diff --git a/app/views/admin/collections/show.html.erb b/app/views/admin/collections/show.html.erb
index c13f42acba..b0d51f7706 100644
--- a/app/views/admin/collections/show.html.erb
+++ b/app/views/admin/collections/show.html.erb
@@ -85,7 +85,7 @@ Unless required by applicable law or agreed to in writing, software distributed
   </div>
   <div class="well-vertical-spacer">
     <%= link_to('Create An Item', new_media_object_path(collection_id: @collection.id), class: 'btn btn-primary', data: { testid: 'collection-create-item-btn' }) if can? :create, MediaObject %>
-    <%= link_to('List All Items', search_catalog_path('f[collection_ssim][]' => @collection.name), class: 'btn btn-outline') %>
+    <%= link_to('List All Items', search_catalog_path('f[collection_ssim][]' => @collection.name), class: 'btn btn-outline', data: { testid: 'collection-list-all-item-btn' }) %>
     <%= button_tag('Edit Collection Info', class: 'btn btn-outline', data: {"bs-toggle": "modal", "bs-target": "#new_collection", testid:"collection-edit-collection-info"}) if can? :update, @collection %>
   </div>
   <div>
diff --git a/app/views/bookmarks/merge.html.erb b/app/views/bookmarks/merge.html.erb
index 4498e88b48..6f4706ba06 100644
--- a/app/views/bookmarks/merge.html.erb
+++ b/app/views/bookmarks/merge.html.erb
@@ -31,7 +31,7 @@ Unless required by applicable law or agreed to in writing, software distributed
               <p><%= t('blacklight.merge.confirm') %></p>
               <% @documents.each do |d| %>
                 <div class="form-check">
-                  <%= radio_button_tag :media_object, d.id, class: 'ms-3' %>
+                  <%= radio_button_tag :media_object, d.id, class: 'ms-3',  data: { testid: "merge-media-object-#{d.id}" } %>
                   <%= label_tag "media_object_#{d.id}", "#{d["title_tesi"] || "No title"} - #{d.id}" , class: 'ms-3' %>
                   <% t('blacklight.merge.insufficient_rights') if cannot? :destroy, SpeedyAF::Proxy::MediaObject.find(d.id) %>
                 </div>
diff --git a/app/views/bookmarks/move.html.erb b/app/views/bookmarks/move.html.erb
index 44b01bdeca..15699bbbe7 100644
--- a/app/views/bookmarks/move.html.erb
+++ b/app/views/bookmarks/move.html.erb
@@ -33,11 +33,11 @@ Unless required by applicable law or agreed to in writing, software distributed
                 <div class="alert">
             <fieldset>
               <p><%= t('blacklight.move.confirm') %></p>
-              <%= select_tag :target_collection_id, options_from_collection_for_select(@candidates, "id", "name"), style: 'width:100%;' %>
+              <%= select_tag :target_collection_id, options_from_collection_for_select(@candidates, "id", "name"), style: 'width:100%;' , data: { testid: "bookmark-collection-dropdown" } %>
             </fieldset>
                 </div>
           <div class="modal-footer">
-            <button type="submit" class="btn btn-primary"><%= t('blacklight.move.button') %></button>
+            <button type="submit" class="btn btn-primary" data-testid = "bookmark-move"><%= t('blacklight.move.button') %></button>
           </div>
         <% end %>
       </div>
diff --git a/app/views/bookmarks/update_access_control.html.erb b/app/views/bookmarks/update_access_control.html.erb
index 1eddb867a7..fb99de5cb6 100644
--- a/app/views/bookmarks/update_access_control.html.erb
+++ b/app/views/bookmarks/update_access_control.html.erb
@@ -79,7 +79,7 @@ Unless required by applicable law or agreed to in writing, software distributed
                   <%= text_field_tag "add_user_end", nil, placeholder: 'End Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %>
                 </div>
                 <div class="d-flex justify-content-start">
-                  <%= button_tag "Add", name: 'submit_add_user', class:'btn btn-outline', value: 'Add' %>
+                  <%= button_tag "Add", name: 'submit_add_user', class:'btn btn-outline', value: 'Add', data: { testid: 'bookmark-add-user' } %>
                   <%= button_tag "Remove", name: 'submit_remove_user', class:'btn btn-outline remove_access', value: 'Remove' %>
                 </div>
               <% end %>
diff --git a/app/views/checkouts/_return_all.html.erb b/app/views/checkouts/_return_all.html.erb
index c9766c6aad..3c9592a701 100644
--- a/app/views/checkouts/_return_all.html.erb
+++ b/app/views/checkouts/_return_all.html.erb
@@ -13,9 +13,17 @@ Unless required by applicable law or agreed to in writing, software distributed
   specific language governing permissions and limitations under the License.
 ---  END LICENSE_HEADER BLOCK  ---
 %>
+<<<<<<< HEAD:app/views/checkouts/_return_all.html.erb
 
 <% if Checkout.active_for_user(current_user.id).count > 1 || current_ability.is_administrator? %>
   <div class="text-start">
     <%= link_to 'Return All', main_app.return_all_checkouts_path , class: 'btn btn-primary btn-md', method: :patch, data: { confirm: 'Are you sure you want to return all items?' } %>
   </div>
 <% end %>
+=======
+<% # container for display inactive checkouts checkbox -%>
+<div class="col-sm-3 offset-9 col-lg-3 offset-lg-10">
+  <%= check_box_tag :inactive_checkouts, data: { testid: 'inactive-checkouts-toggle' } %>
+  <%= label_tag :inactive_checkouts, 'Display Returned Items', class: 'fw-bold' %>
+</div>
+>>>>>>> d2a17bdeb (high priority test cases):app/views/checkouts/_inactive_checkout.html.erb
diff --git a/app/views/checkouts/index.html.erb b/app/views/checkouts/index.html.erb
index a31dc32a57..77fbe99fa3 100644
--- a/app/views/checkouts/index.html.erb
+++ b/app/views/checkouts/index.html.erb
@@ -26,4 +26,45 @@ Unless required by applicable law or agreed to in writing, software distributed
   <% else %>
     <p>No matching records found.</p>
   <% end %>
+<<<<<<< HEAD
+=======
+
+  <table id="checkouts-table" class="table table-striped datatable" data-testid="checkouts-table">
+    <thead>
+      <tr>
+        <% if current_ability.is_administrator? %>
+          <th>User</th>
+        <% end %>
+        <th>Media object</th>
+        <th>Checkout time</th>
+        <th>Return time</th>
+        <th>Time remaining</th>
+        <th data-orderable="false">
+          <% if Checkout.active_for_user(current_user.id).count > 1 || current_ability.is_administrator? %>
+              <%= link_to 'Return All', main_app.return_all_checkouts_path , class: 'btn btn-primary btn-xs', method: :patch, data: { confirm: 'Are you sure you want to return all items?' } %>
+          <% end %>
+        </th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @checkouts.each do |checkout| %>
+        <tr data-testid="checkout-row">
+          <% if current_ability.is_administrator? %>
+            <td><%= checkout.user.user_key %></td>
+          <% end %>
+          <td><%= link_to checkout.media_object.title, main_app.media_object_url(checkout.media_object) ,data: { testid: "checkout-media-title" }%></td>
+          <td><span data-utc-time="<%= checkout.checkout_time.iso8601 %>" /></td>
+          <td><span data-utc-time="<%= checkout.return_time.iso8601 %>" /></td>
+          <td><%= distance_of_time_in_words(checkout.return_time - DateTime.current) %></td>
+          <td>
+            <% if checkout.return_time > DateTime.current %>
+              <%= link_to 'Return', return_checkout_url(checkout), class: 'btn btn-outline btn-xs', method: :patch, data: { testid: 'checkout-return' } %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+>>>>>>> d2a17bdeb (high priority test cases)
 </div>
diff --git a/app/views/media_objects/_access_control.html.erb b/app/views/media_objects/_access_control.html.erb
index 5603587d96..89f13e2977 100644
--- a/app/views/media_objects/_access_control.html.erb
+++ b/app/views/media_objects/_access_control.html.erb
@@ -29,7 +29,7 @@ Unless required by applicable law or agreed to in writing, software distributed
             <label class="col-form-label" for="add_lending_period_days">
               <span data-title="Days">Days</span>
             </label>
-            <%= text_field_tag "add_lending_period_days", d ? d : 0, class: 'form-control' %>
+            <%= text_field_tag "add_lending_period_days", d ? d : 0, class: 'form-control', data:{testid: 'media-object-lending-period-days'} %>
           </div>
           <div class="col-1">
             <label class="col-form-label" for="add_lending_period_hours">
diff --git a/app/views/media_objects/_destroy_checkout.html.erb b/app/views/media_objects/_destroy_checkout.html.erb
index a722c433ac..f46f0d26d3 100644
--- a/app/views/media_objects/_destroy_checkout.html.erb
+++ b/app/views/media_objects/_destroy_checkout.html.erb
@@ -23,7 +23,7 @@ Unless required by applicable law or agreed to in writing, software distributed
     </div>
     <div class="col-5 col-sm-3 col-md-4">
       <%= link_to 'Return now', return_checkout_url(current_checkout), class: 'btn btn-outline', method: :patch,
-        id: "return-btn", data: { checkout_returntime: current_checkout.return_time } %>
+        id: "return-btn", data: { checkout_returntime: current_checkout.return_time, testid: 'media-object-return-now-btn' } %>
     </div>
     <div id="check-out-expired" class="modal fade" role="dialog" data-bs-backdrop="static">
       <div class="modal-dialog modal-lg">
diff --git a/app/views/modules/_autocomplete_input.html.erb b/app/views/modules/_autocomplete_input.html.erb
index 5d26d045e8..9c16c9bc2f 100644
--- a/app/views/modules/_autocomplete_input.html.erb
+++ b/app/views/modules/_autocomplete_input.html.erb
@@ -21,8 +21,9 @@ Unless required by applicable law or agreed to in writing, software distributed
     id: field_id,
     class: "form-control typeahead-input",
     data: data,
+    data: { testid: "autocomplete-user-input" },
     disabled: disabled,
     placeholder: placeholder %>
-  <ul class='autocomplete_popup' id=<%= "#{for_field}-popup" %>></ul>
+  <ul class='autocomplete_popup' data-testid="user-popup" id=<%= "#{for_field}-popup" %>></ul>
   <div class='visually-hidden autocomplete_feedback'id=<%= "#{for_field}-popup-feedback" %>></div>
 </auto-complete>
diff --git a/spec/cypress/integration/cdl_spec.js b/spec/cypress/integration/cdl_spec.js
new file mode 100644
index 0000000000..0e1c6269c0
--- /dev/null
+++ b/spec/cypress/integration/cdl_spec.js
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2011-2025, The Trustees of Indiana University and Northwestern
+ *   University.  Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ---  END LICENSE_HEADER BLOCK  ---
+ */
+
+import { navigateToManageContent } from '../support/navigation';
+import CollectionPage from '../pageObjects/collectionPage';
+import HomePage from '../pageObjects/homePage';
+const homePage = new HomePage();
+import {
+  navigateToManageContent,
+  selectLoggedInUsersOnlyAccess,
+  performSearch,
+} from '../support/navigation';
+
+context('Selected Items', () => {
+  const collectionPage = new CollectionPage();
+
+  var collection_title = `Automation collection title ${
+    Math.floor(Math.random() * 10000) + 1
+  }`;
+  var media_object_title = `Automation Item title ${
+    Math.floor(Math.random() * 100000) + 1
+  }`;
+  var media_object_id;
+
+  Cypress.on('uncaught:exception', (err, runnable) => {
+    if (
+      err.message.includes(
+        "Cannot read properties of undefined (reading 'success')"
+      ) ||
+      err.message.includes(
+        "Cannot read properties of undefined (reading 'times')"
+      )
+    ) {
+      return false;
+    }
+  });
+
+  // Create collection and complex media object before all tests
+  before(() => {
+    cy.login('administrator');
+    navigateToManageContent();
+
+    // Create collection with public access
+    collectionPage.createCollection(
+      { title: collection_title },
+      { setPublicAccess: false }
+    );
+
+    // Navigate to the collection and create complex media object
+    collectionPage.navigateToCollection(collection_title);
+
+    collectionPage.createItem(media_object_title, {
+      publish: true,
+      addStructure: true,
+    });
+
+    // Get the media object ID from the alias
+    cy.get('@mediaObjectId').then((id) => {
+      media_object_id = id;
+    });
+  });
+  // Clean up after all tests - ITEM FIRST, THEN COLLECTION
+  after(() => {
+    cy.login('administrator');
+    // Delete the media object first (if it exists)
+    if (media_object_id) {
+      collectionPage.deleteItemById(media_object_id);
+    }
+
+    // Then delete the collection
+    collectionPage.deleteCollectionByName(collection_title);
+  });
+});
+it('Verify that the checkouts menu option does not display if CDL is not enabled for Avalon - @Tf7bf6b9a', () => {
+  cy.login('administrator');
+  // Checkout option does not exist
+  cy.get('a[href="/checkouts"]').should('not.exist');
+  // Navigate to collection page and verify cdl option does not exist
+  collectionPage.navigateToCollection(collection_title);
+  cy.get('[data-testid="collection-enable-cdl-card"]').should('not.exist');
+  cy.get('[data-testid="collection-item-lending-period-card"]').should(
+    'not.exist'
+  );
+});
+it('Verify CDL is enabled - @T3c2f5e2e', () => {
+  cy.login('administrator');
+  // Checkout option exists
+  cy.get('a[href="/checkouts"]').should('exist').and('be.visible');
+  // Navigate to collection page and verify CDL controls exist
+  collectionPage.navigateToCollection(collection_title);
+  cy.get('[data-testid="collection-enable-cdl-card"]')
+    .should('exist')
+    .and('be.visible');
+  cy.get('[data-testid="collection-item-lending-period-card"]')
+    .should('exist')
+    .and('be.visible');
+});
+
+it('Enable CDL for a collection and borrow an item- @T3c2f5e2e', () => {
+  cy.login('administrator');
+  // Checkout option exists
+  cy.get('a[href="/checkouts"]').should('exist').and('be.visible');
+  // Navigate to collection page and verify CDL controls exist
+  collectionPage.navigateToCollection(collection_title);
+  cy.get('[data-testid="cdl-enable-checkbox"]').click({ force: true });
+  cy.get('[data-testid="cdl-save-setting"]').click();
+  cy.visit('/media_objects/' + media_object_id);
+  // verify the borrow gate text is shown
+  cy.get('.checkout .centered.video')
+    .should('be.visible')
+    .within(() => {
+      cy.contains('p', 'Borrow this item to access media resources.').should(
+        'be.visible'
+      );
+
+      // verify the borrow button
+      cy.get('input[type="submit"][value="Borrow for 14 days"]').should(
+        'be.visible'
+      );
+    });
+  //Click on borrow button and verify the media player is shown
+  cy.get('input[type="submit"][value="Borrow for 14 days"]').click();
+  cy.get('button[title="Play Video"]')
+    .should('be.visible')
+    .and('contain', 'Play Video');
+  cy.contains('Details').should('be.visible');
+  cy.contains('Sections').should('be.visible');
+  cy.get('[data-testid="media-object-return-now-btn"]').should('be.visible');
+  // Verify the counter on the checkouts nav link
+  cy.get('[data-testid="checkout-counter"]')
+    .should('be.visible')
+    .and('have.text', '1');
+});
+
+it('Verify returning items from checkouts page - @T73acc852', () => {
+  cy.login('administrator');
+  // Checkout option exists
+  cy.visit(`/checkouts`);
+  // find the row for this media object
+  cy.get('[data-testid="checkout-row"]')
+    .contains('[data-testid="checkout-media-title"]', media_object_title)
+    .should('be.visible')
+    .closest('[data-testid="checkout-row"]')
+    .as('row');
+
+  // verify Return exists in that row, then click it
+  cy.get('@row')
+    .find('[data-testid="checkout-return"]')
+    .should('be.visible')
+    .click();
+  // Verify that the item is no longer in the checkouts list
+  cy.get('[data-testid="checkouts-table"]').within(() => {
+    cy.contains(
+      '[data-testid="checkout-media-title"]',
+      media_object_title
+    ).should('not.exist');
+  });
+
+  // Verify the counter on the checkouts nav link is updated
+  cy.get('[data-testid="checkout-counter"]')
+    .should('be.visible')
+    .and('have.text', '0');
+
+  cy.visit('/media_objects/' + media_object_id);
+  // verify the borrow gate text is shown
+  cy.get('.checkout .centered.video')
+    .should('be.visible')
+    .within(() => {
+      cy.contains('p', 'Borrow this item to access media resources.').should(
+        'be.visible'
+      );
+
+      // verify the borrow button
+      cy.get('input[type="submit"][value="Borrow for 14 days"]').should(
+        'be.visible'
+      );
+    });
+});
+
+it('Verify changing the default lending period for a CDL collection - apply to all existing items - @T33474bca', () => {
+  cy.login('administrator');
+  collectionPage.navigateToCollection(collection_title);
+  cy.get('[data-testid="add-lending-period-days"]').clear().type('3');
+  cy.on('window:confirm', () => true);
+  cy.get('[data-testid="lending-period-apply-to-all"]').click();
+  cy.get('[data-testid="add-lending-period-days"]').should('have.value', '3');
+  //verify that the lending period for the existing item is updated to 3 days
+  cy.visit('/media_objects/' + media_object_id);
+  cy.get('input[type="submit"][value="Borrow for 3 days"]')
+    .should('be.visible')
+    .and('have.value', 'Borrow for 3 days');
+  cy.get('[data-testid="media-object-edit-btn"]').click();
+  //Verify in access control tab lending period is updated to 3 days
+  cy.get('[data-testid="media-object-lending-period-days"]').should(
+    'have.value',
+    '3'
+  );
+});
+
+it('Verify Turning CDL off for a collection- @Tf26d8884', () => {
+  cy.login('administrator');
+  // Checkout option exists
+  cy.get('a[href="/checkouts"]').should('exist').and('be.visible');
+  // Navigate to collection page and turn CDL off
+  collectionPage.navigateToCollection(collection_title);
+  cy.get('[data-testid="cdl-enable-checkbox"]').click({ force: true });
+  cy.get('[data-testid="cdl-save-setting"]').click();
+  cy.visit('/media_objects/' + media_object_id);
+  //Click on borrow button and verify the media player is shown
+  cy.get('input[type="submit"][value="Borrow for 14 days"]').click();
+  cy.get('button[title="Play Video"]')
+    .should('be.visible')
+    .and('contain', 'Play Video');
+  cy.contains('Details').should('be.visible');
+  cy.contains('Sections').should('be.visible');
+  cy.get('[data-testid="media-object-return-now-btn"]').should('be.visible');
+});
+
+it('Verify that the checkouts page displays the list of borrowed items - @T33474bca', () => {
+  cy.login('administrator');
+  cy.visit(`/checkouts`);
+  // Click on display returned items checkbox
+  cy.get('[data-testid="inactive-checkouts-toggle"]').click();
+  //search for the returned item
+  cy.get('input[type="search"][aria-controls="checkouts-table"]')
+    .clear()
+    .type(media_object_title);
+  // Verify that the returned item is displayed
+  cy.get('[data-testid="checkout-row"]')
+    .contains('[data-testid="checkout-media-title"]', media_object_title)
+    .should('be.visible')
+    .closest('[data-testid="checkout-row"]');
+});
diff --git a/spec/cypress/integration/media_object_spec.js b/spec/cypress/integration/media_object_spec.js
index bdb1b86b82..314df5c5ff 100644
--- a/spec/cypress/integration/media_object_spec.js
+++ b/spec/cypress/integration/media_object_spec.js
@@ -435,5 +435,626 @@ context('Media objects', () => {
           });
       }
     );
+
+    it('Verify the icons in a video player - in full screen mode - @T503d2ee1', () => {
+      //scope to the player
+      cy.get('[data-testid="media-player"]').as('player');
+
+      //Go fullscreen
+      cy.get('@player')
+        .find('.vjs-fullscreen-control')
+        .should('be.visible')
+        .click({ force: true });
+
+      //Verify the player entered fullscreen
+      cy.get('@player')
+        .find('[data-testid="videojs-video-element"]')
+        .should('have.class', 'vjs-fullscreen');
+
+      //Center play button
+      cy.get('@player')
+        .find('button.vjs-big-play-button[title="Play Video"]')
+        .should('be.visible');
+
+      //Play/Pause button in control bar
+      cy.get('@player')
+        .find(
+          'button.vjs-play-control[title*="Play"], button.vjs-play-control[title*="Pause"]'
+        )
+        .should('be.visible');
+
+      // Previous / Next
+      cy.get('@player')
+        .find('[data-testid="videojs-previous-button"]')
+        .should('be.visible');
+      cy.get('@player')
+        .find('[data-testid="videojs-next-button"]')
+        .should('be.visible');
+
+      // Li'l scrub (track scrubber) toggle
+      cy.get('@player')
+        .find('[data-testid="videojs-track-scrubber-button"]')
+        .should('be.visible');
+
+      //Captions toggle (only visible when a caption track exists)
+      cy.get('@player')
+        .find('button.vjs-subs-caps-button')
+        .should('be.visible');
+
+      // Volume control (mute button + volume bar present)
+      cy.get('@player').find('.vjs-mute-control').should('be.visible');
+      cy.get('@player').find('.vjs-volume-bar').should('exist');
+
+      //Quality selector button
+      cy.get('@player')
+        .find('.vjs-quality-selector button[title*="quality"]')
+        .should('be.visible');
+
+      //Fullscreen control visible (already clicked above)
+      cy.get('@player').find('.vjs-fullscreen-control').should('be.visible');
+    });
+
+    it('Verify the player pause and play actions - Video - @T7be623ee', () => {
+      cy.get('[data-testid="media-player"]').as('player');
+      cy.get('@player')
+        .find('video[data-testid="videojs-video-element"]')
+        .as('video');
+      cy.get('@player').find('.vjs-big-play-button').as('centerPlay');
+      cy.get('@player').find('button.vjs-play-control').as('playPauseBtn');
+      cy.get('@player').find('.vjs-fullscreen-control').as('fullscreenBtn');
+
+      const expectPlaying = () => {
+        cy.get('@video').should(($v) => {
+          expect($v[0].paused, 'video paused flag').to.eq(false);
+        });
+        cy.get('@video')
+          .invoke('prop', 'currentTime')
+          .then((t1) => {
+            cy.wait(800);
+            cy.get('@video')
+              .invoke('prop', 'currentTime')
+              .should((t2) => {
+                expect(t2, 'time advanced').to.be.greaterThan(t1);
+              });
+          });
+      };
+
+      const expectPaused = () => {
+        cy.get('@video').should(($v) => {
+          expect($v[0].paused, 'video paused flag').to.eq(true);
+        });
+      };
+
+      //Start playback
+      cy.get('@centerPlay').should('be.visible').click({ force: true });
+      expectPlaying();
+
+      //Click the player screen to pause/resume multiple times
+      Cypress._.times(2, () => {
+        //click to pause
+        cy.get('@video').click({ force: true });
+        expectPaused();
+
+        //click to play
+        cy.get('@video').click({ force: true });
+        expectPlaying();
+      });
+
+      //Use the play/pause icon in the control bar
+      //pause
+      cy.get('@playPauseBtn').click({ force: true });
+      expectPaused();
+      //play
+      cy.get('@playPauseBtn').click({ force: true });
+      expectPlaying();
+
+      //Enter fullscreen
+      cy.get('@fullscreenBtn').should('be.visible').click({ force: true });
+      // Confirm fullscreen class on the player root
+      cy.get('@player')
+        .find('[data-testid="videojs-video-element"]')
+        .should('have.class', 'vjs-fullscreen');
+
+      //Play/Pause using the control button in fullscreen
+      cy.get('@playPauseBtn').click({ force: true });
+      expectPaused();
+      cy.get('@playPauseBtn').click({ force: true });
+      expectPlaying();
+    });
+
+    it('Verify the players hotkeys for pause and play actions - Video and Audio - @@T633feb48', () => {
+      cy.get('[data-testid="media-player"]').as('player');
+      cy.get('@player')
+        .find('video[data-testid="videojs-video-element"]')
+        .as('video');
+      cy.get('@player').find('.vjs-big-play-button').as('centerPlay');
+      cy.get('@player').find('button.vjs-play-control').as('playPauseBtn');
+      cy.get('@player').find('.vjs-fullscreen-control').as('fullscreenBtn');
+      const expectPlaying = () =>
+        cy
+          .get('@video')
+          .should(($v) => expect($v[0].paused, 'paused flag').to.eq(false));
+      const expectPaused = () =>
+        cy
+          .get('@video')
+          .should(($v) => expect($v[0].paused, 'paused flag').to.eq(true));
+
+      // Start playback
+      cy.get('@centerPlay').click({ force: true });
+      expectPlaying();
+
+      //space toggles when player is focused
+      cy.get('[data-testid="media-player"]').click();
+      cy.get('body').type('{space}'); //pause
+      expectPaused();
+      cy.get('body').type('{space}'); //play
+      expectPlaying();
+      //
+      [
+        '[data-testid="browse-global-search-input"]',
+        '[data-testid="media-object-add-to-playlist-btn"]',
+        '[data-testid="media-object-create-timeline-btn"]',
+      ].forEach((sel) => {
+        cy.get(sel)
+          .should('exist')
+          .clear()
+          .type('hello world')
+          .should('have.value', 'hello world');
+        // video should still be playing
+        expectPlaying();
+      });
+      //control bar play/pause button
+      cy.get('@playPauseBtn').click({ force: true });
+      expectPaused();
+      cy.get('@playPauseBtn').click({ force: true });
+      expectPlaying();
+
+      //fullscreen and repeat spacebar check
+      cy.get('@fullscreenBtn').click({ force: true });
+      cy.get('@player')
+        .find('[data-testid="videojs-video-element"]')
+        .should('have.class', 'vjs-fullscreen');
+
+      cy.get('body').type('{space}'); //pause
+      cy.get('body').type('{space}'); //play
+      expectPlaying();
+    });
+    it('Verify the players pause and play actions - Audio- @T190702b9', () => {
+      // Click on the audio file in the structure nav
+      cy.get('[data-testid="tree-item"][data-label="test_sample_audio.mp3"]')
+        .find('[data-testid="treeitem-section-button"]')
+        .click({ force: true });
+
+      // Aliases
+      cy.get('[data-testid="media-player"]').as('player');
+      cy.get('video[data-testid="videojs-audio-element"]').as('audioEl');
+      cy.get('@player').find('button.vjs-play-control').as('playPause');
+
+      // Play
+      cy.get('@playPause').click({ force: true });
+      cy.get('@audioEl').should(($a) => expect($a[0].paused).to.eq(false));
+
+      // Ensure time advances
+      cy.get('@audioEl')
+        .invoke('prop', 'currentTime')
+        .then((t0) => {
+          cy.wait(800);
+          cy.get('@audioEl').invoke('prop', 'currentTime').should('be.gt', t0);
+        });
+
+      // Pause
+      cy.get('@playPause').click({ force: true });
+      cy.get('@audioEl').should(($a) => expect($a[0].paused).to.eq(true));
+    });
+
+    it('Verify the players Play forward and backwards actions - Video - @Td8360414', () => {
+      cy.get('[data-testid="media-player"]').as('player');
+      cy.get('video[data-testid="videojs-video-element"]').as('videoEl');
+      cy.get('@player').find('.vjs-play-control').as('playPause');
+      cy.get('@player')
+        .find('[data-testid="videojs-custom-seekbar"]')
+        .as('seekbar');
+      cy.get('@player')
+        .find('[data-testid="videojs-track-scrubber-button"]')
+        .as('scrubberBtn');
+      //Start playback
+      cy.get('@playPause').click({ force: true });
+      cy.get('@videoEl').should(($v) => expect($v[0].paused).to.eq(false));
+
+      //scrub forward
+      cy.get('@videoEl')
+        .invoke('prop', 'currentTime')
+        .then((t0) => {
+          cy.get('@seekbar').click('center', { force: true });
+          cy.get('@videoEl')
+            .invoke('prop', 'currentTime')
+            .should((t1) => {
+              expect(t1).to.be.greaterThan(t0);
+              expect(t1).to.be.within(20, 40); //middle of video
+            });
+          // Scrub back
+          cy.get('@seekbar').click('left', { force: true });
+          cy.get('@videoEl')
+            .invoke('prop', 'currentTime')
+            .should((t2) => expect(t2).to.be.lessThan(15));
+        });
+
+      //open Scrubber and scrub forward and backward
+      cy.get('@scrubberBtn').click({ force: true });
+      cy.get('#track_scrubber .vjs-track-scrubber').as('miniScrubber');
+      cy.get('@videoEl')
+        .invoke('prop', 'currentTime')
+        .then((s0) => {
+          cy.get('@miniScrubber').click('right', { force: true });
+          cy.get('@videoEl')
+            .invoke('prop', 'currentTime')
+            .should((s1) => expect(s1).to.be.gt(s0));
+          cy.get('@miniScrubber').click('left', { force: true });
+          cy.get('@videoEl')
+            .invoke('prop', 'currentTime')
+            .should((s2) => expect(s2).to.be.lt(s1));
+        });
+      //arrow key hotkeys for +5 and -5seconds
+      cy.get('@player').click('center', { force: true });
+      cy.get('@videoEl')
+        .invoke('prop', 'currentTime')
+        .then((k0) => {
+          cy.get('body').type('{rightarrow}');
+          cy.wait(300);
+          cy.get('@videoEl')
+            .invoke('prop', 'currentTime')
+            .should((k1) => expect(k1).to.be.closeTo(k0 + 5, 1));
+          cy.get('body').type('{leftarrow}');
+          cy.wait(300);
+          cy.get('@videoEl')
+            .invoke('prop', 'currentTime')
+            .should((k2) => expect(k2).to.be.closeTo(k0, 2));
+        });
+
+      // Click on Fullscreen
+      cy.get('@player').find('.vjs-fullscreen-control').click({ force: true });
+      cy.get('@player').should('have.class', 'vjs-fullscreen');
+
+      //Scrub again in fullscreen and verify seek works
+      cy.get('@seekbar').click('center', { force: true });
+      cy.wait(500);
+      cy.get('@videoEl')
+        .invoke('prop', 'currentTime')
+        .should((f1) => expect(f1).to.be.within(20, 50));
+    });
+
+    it('Verify whether the user is able to adjust volume in the video player  - @Te7a1268e', () => {
+      cy.get('[data-testid="media-player"]').as('player');
+      cy.get('video[data-testid="videojs-video-element"]').as('videoEl');
+      cy.get('@player').find('.vjs-mute-control').as('muteBtn');
+      cy.get('@player').find('.vjs-volume-bar').as('volumeBar');
+      cy.get('@player').find('.vjs-fullscreen-control').as('fullscreenBtn');
+      // Start play
+      cy.get('@player').find('.vjs-play-control').click({ force: true });
+
+      //Adjust audio via volume slider
+      cy.get('@volumeBar').click('right', { force: true });
+      cy.get('@volumeBar')
+        .invoke('attr', 'aria-valuenow')
+        .should('not.eq', '0');
+      //Mute and unmute with icon
+      cy.get('@muteBtn').click({ force: true });
+      cy.get('@muteBtn').should('have.class', 'vjs-vol-0');
+      cy.get('@muteBtn').click({ force: true });
+      cy.get('@muteBtn').should('not.have.class', 'vjs-vol-0');
+
+      //using keyboard m key to mute and unmute player
+      cy.get('@player').click('center', { force: true }); //focusing
+      cy.get('body').type('m'); //mute
+      cy.get('@muteBtn').should('have.class', 'vjs-vol-0');
+      cy.get('body').type('m'); //unmute
+      cy.get('@muteBtn').should('not.have.class', 'vjs-vol-0');
+      cy.get('body').type('{uparrow}'); // increase volume
+      cy.wait(300);
+      cy.get('body').type('{downarrow}'); // decrease volume
+      //Fullscreen for mute and unmute test
+      cy.get('@fullscreenBtn').click({ force: true });
+      cy.get('@player').should('have.class', 'vjs-fullscreen');
+      cy.get('body').type('m'); // mute
+      cy.get('@muteBtn').should('have.class', 'vjs-vol-0');
+      cy.get('body').type('m'); //unmute
+      cy.get('@muteBtn').should('not.have.class', 'vjs-vol-0');
+    });
+
+    it('Verify playing the video in full screen - @T384ebffc', () => {
+      cy.get('[data-testid="media-player"]').as('player');
+      cy.get('video[data-testid="videojs-video-element"]').as('videoEl');
+      cy.get('@player').find('.vjs-fullscreen-control').as('fullscreenBtn');
+
+      // play video and clicking on fullscreen
+      cy.get('@player').find('.vjs-play-control').click({ force: true });
+      cy.get('@fullscreenBtn').click({ force: true });
+
+      //verifying fullscreen
+      cy.get('@player').should('have.class', 'vjs-fullscreen');
+      cy.get('@fullscreenBtn')
+        .should('have.attr', 'title')
+        .and('match', /Exit/i);
+      //exiting fullscreen
+      cy.get('@fullscreenBtn').click({ force: true });
+      cy.get('@player').should('not.have.class', 'vjs-fullscreen');
+
+      //using keyboard keys to enter and exit fullscreen
+      cy.get('@player').click('center', { force: true });
+      cy.get('body').type('f');
+      cy.get('@player').should('have.class', 'vjs-fullscreen');
+      cy.wait(500);
+      cy.get('body').type('f');
+      cy.get('@player').should('not.have.class', 'vjs-fullscreen');
+      cy.get('body').type('f');
+      cy.get('@player').should('have.class', 'vjs-fullscreen');
+      cy.get('body').type('{esc}');
+      cy.get('@player').should('not.have.class', 'vjs-fullscreen');
+    });
+
+    it('Verify that the user can navigate through the video using the time markers in the transcript. - @T467587bd', () => {
+      //adding the transcript to the first video section
+      cy.get('[data-testid="media-object-edit-btn"]').click();
+      cy.get(
+        '[data-testid="media-object-side-nav-link"][href*="file-upload"]'
+      ).click();
+      cy.get('[data-testid="media-object-manage-files-edit-btn"]').click();
+      const transcriptFile = 'fixtures/transcript-example.vtt';
+      cy.get(
+        '[data-testid="media-object-upload-button-transcript"]'
+      ).selectFile(transcriptFile, {
+        force: true,
+      });
+      cy.contains('Upload').click();
+      cy.contains('transcript-example.vtt').should('be.visible');
+      cy.get('[data-testid="media-object-continue-btn"]').click();
+      cy.visit('/media_objects/' + media_object_id);
+      cy.waitForVideoReady();
+      // Click the Transcripts tab
+      cy.get('button[id*="tab-transcripts"]').click({ force: true });
+      //verify the dropdown and transcripts
+      cy.get('[data-testid="transcript_nav"]').should('exist');
+      cy.get('[data-testid="transcript-select-option"]').should('be.visible');
+      cy.get('[data-testid="transcript_item"]').should(
+        'have.length.greaterThan',
+        1
+      );
+      //play
+      cy.get('[data-testid="media-player"] .vjs-play-control').click({
+        force: true,
+      });
+      // click on 8 seccond timestamp
+      cy.contains('[data-testid="transcript_time"]', '[00:00:08]').click({
+        force: true,
+      });
+      // verifying with the current time of video
+      cy.get('video[data-testid="videojs-video-element"]')
+        .invoke('prop', 'currentTime')
+        .should((currentTime) => {
+          expect(currentTime).to.be.within(7, 9);
+        });
+
+      cy.get('video[data-testid="videojs-video-element"]').should(($v) => {
+        expect($v[0].paused).to.eq(false);
+      });
+    });
+
+    it('Verify the "auto scroll" feature inside the transcripts - @T586e8d8d', () => {
+      cy.get('button[id*="tab-transcripts"]').click({ force: true });
+
+      // verifying auto-scroll checked
+      cy.get(
+        '[data-testid="transcript-auto-scroll-check"] input[type="checkbox"]'
+      )
+        .as('autoScroll')
+        .check({ force: true })
+        .should('be.checked');
+
+      // play video
+      cy.get('[data-testid="media-player"] .vjs-play-control').click({
+        force: true,
+      });
+
+      // Scroll
+      cy.get('[data-testid="transcript_content_1"]')
+        .invoke('scrollTop')
+        .then((initialScroll) => {
+          // 4 secoonds wait
+          cy.wait(4000);
+          // Verify transcript scrolled
+          cy.get('[data-testid="transcript_content_1"]')
+            .invoke('scrollTop')
+            .should('be.greaterThan', initialScroll);
+        });
+    });
+
+    it('Verify searching for text inside the transcript - @Taaec6730', () => {
+      cy.get('button[id*="tab-transcripts"]').click({ force: true });
+      cy.get('[data-testid="transcript-search-input"]').should('exist');
+
+      //search keyword in trsnacript
+      cy.get('[data-testid="transcript-search-input"]').clear().type('file');
+
+      //verify search count
+      cy.get('[data-testid="transcript-search-count"]')
+        .should('be.visible')
+        .and('contain.text', '1 of 4 results');
+
+      // verify highlighted search results
+      cy.get('.ramp--transcript_highlight').should('exist');
+
+      // click next search result
+      cy.get('[data-testid="transcript-search-next"]').click({ force: true });
+      //click on highlighted transcript text to go to that time
+      cy.get('.ramp--transcript_highlight').first().click({ force: true });
+      //Verify video currentTime moves near that transcript time
+      cy.get('video[data-testid="videojs-video-element"]')
+        .invoke('prop', 'currentTime')
+        .should('be.gt', 0);
+      //check that transcript stays focused on current hit
+      cy.get('.ramp--transcript_item.active').should('contain.text', 'file');
+    });
+
+    it('Verify turning off closed captions- @T37ee208e', () => {
+      // Ensure captions button exists
+      cy.get('[data-testid="media-player"]').within(() => {
+        cy.get('button.vjs-subs-caps-button').as('ccButton');
+        cy.get('@ccButton').should('exist');
+      });
+      // Turn captions ON
+      cy.get('@ccButton').click({ force: true });
+      cy.get('.vjs-menu-content')
+        .contains('captions-example.srt')
+        .click({ force: true });
+      // captions ae enabled and CC icon is active
+      cy.get('.vjs-text-track-display').should('be.visible');
+      cy.get('@ccButton').should('have.class', 'captions-on');
+      // Turn captions OFF
+      cy.get('@ccButton').click({ force: true });
+      cy.get('.vjs-menu-content')
+        .contains('captions off', { matchCase: false })
+        .click({ force: true });
+      // verify captions hidden and CC icon not active
+      cy.get('.vjs-text-track-display').should('not.be.visible');
+      cy.get('@ccButton').should('not.have.class', 'captions-on');
+      //Fullscreen caption toggle and repeat test
+      cy.get('.vjs-fullscreen-control').click({ force: true });
+      cy.get('@ccButton').click({ force: true });
+      cy.get('.vjs-menu-content')
+        .contains('captions-example.srt')
+        .click({ force: true });
+      cy.get('.vjs-text-track-display').should('be.visible');
+
+      cy.get('@ccButton').click({ force: true });
+      cy.get('.vjs-menu-content')
+        .contains('captions off', { matchCase: false })
+        .click({ force: true });
+      cy.get('.vjs-text-track-display').should('not.be.visible');
+
+      // Exit fullscreen
+      cy.get('.vjs-fullscreen-control').click({ force: true });
+    });
+
+    it('Verify previous / next canvas buttons- @T75b6b6ef', () => {
+      cy.get('[data-testid="media-player"]').as('player');
+      cy.get('video[data-testid="videojs-video-element"]').as('videoEl');
+      //play video
+      cy.get('@player').find('button.vjs-play-control').click({ force: true });
+      cy.get('@videoEl').should(($v) => expect($v[0].paused).to.eq(false));
+      //click next button
+      cy.get('@player')
+        .find('button.vjs-next-button')
+        .should('exist')
+        .click({ force: true });
+
+      // verify the section has changed
+      //verify time resets
+      cy.get('@videoEl').invoke('prop', 'currentTime').should('be.lt', 5);
+
+      // click on previous button
+      cy.get('@player')
+        .find('button.vjs-previous-button')
+        .should('exist')
+        .click({ force: true });
+      // time resets again
+      cy.get('@videoEl').invoke('prop', 'currentTime').should('be.lt', 5);
+    });
+    it('Verify that media player (audio/video) automatically advances to the next section once the current section is played - @TPlayerAutoAdvanceUnified', () => {
+      cy.get('[data-testid="media-player"]').as('player');
+      cy.get('[data-testid="structured-nav"]').as('nav');
+      // Detect audio or video
+      cy.get('@player').then(($el) => {
+        const hasVideo =
+          $el.find('video[data-testid="videojs-video-element"]').length > 0;
+        const hasAudio =
+          $el.find('audio[data-testid="videojs-audio-element"]').length > 0;
+
+        const mediaSelector = hasVideo
+          ? 'video[data-testid="videojs-video-element"]'
+          : 'audio[data-testid="videojs-audio-element"]';
+        const durationMs = hasVideo ? 60000 : 12000; //58-video and 10-audio
+
+        cy.get(mediaSelector).as('mediaEl');
+
+        // play
+        cy.get('@nav')
+          .find('[data-testid="treeitem-section-button"]')
+          .first()
+          .as('firstSection')
+          .click({ force: true });
+        cy.get('@player').find('.vjs-play-control').click({ force: true });
+        cy.get('@firstSection').should('have.class', 'active'); // section highlighted
+        cy.wait(durationMs); //wait
+        // next section highloghted
+        cy.get('@nav')
+          .find('[data-testid="treeitem-section-button"].active')
+          .should(($btns) => {
+            expect($btns.length).to.eq(1);
+          });
+
+        //verify it is still playing
+        cy.get('@mediaEl').should(($m) => expect($m[0].paused).to.eq(false));
+        cy.visit('/media_objects/' + media_object_id);
+        cy.waitForVideoReady();
+        //fullscreen test
+        if (hasVideo) {
+          cy.get('.vjs-fullscreen-control').click({ force: true });
+          cy.get('@player').should('have.class', 'vjs-fullscreen');
+
+          cy.wait(durationMs);
+          cy.get('@nav')
+            .find('[data-testid="treeitem-section-button"].active')
+            .should('exist');
+
+          //esp fullscreen
+          cy.get('.vjs-fullscreen-control').click({ force: true });
+        }
+      });
+    });
+
+    it('Verify compatibility of the video player Across Different screens - @T24d89b38', () => {
+      const viewports = [
+        [1920, 1080], // Desktop
+        [1366, 768], // Laptop
+        [1280, 800], // Tablet
+        [414, 896], // Mobile
+      ];
+
+      viewports.forEach(([w, h]) => {
+        cy.viewport(w, h);
+        cy.login('administrator');
+        cy.search('Sample Video Item');
+        cy.contains('Sample Video Item').click({ force: true });
+
+        cy.get('[data-testid="media-player"]').should('be.visible');
+        cy.get('video[data-testid="videojs-video-element"]').should(
+          'be.visible'
+        );
+
+        // Play video
+        cy.get('.vjs-play-control').click({ force: true });
+        cy.get('video').should(($v) => expect($v[0].paused).to.eq(false));
+        //verifying that key controls are visible and not cut off
+        cy.get('.vjs-control-bar').should('be.visible');
+        cy.get('.vjs-fullscreen-control').should('be.visible');
+        cy.get('.vjs-mute-control').should('be.visible');
+      });
+    });
+
+    it('Verify that users can stream the video on the media player in landscape mode -@T017627dd', () => {
+      cy.viewport(896, 414); // Landscape mobile size
+      cy.get('[data-testid="media-player"]').should('be.visible');
+      cy.get('video[data-testid="videojs-video-element"]').should('be.visible');
+
+      // play
+      cy.get('.vjs-play-control').click({ force: true });
+      cy.get('video').should(($v) => expect($v[0].paused).to.eq(false));
+
+      // playing continues in landscape
+      cy.wait(2000);
+      cy.get('video').should(($v) =>
+        expect($v[0].currentTime).to.be.greaterThan(0)
+      );
+    });
   });
 });
diff --git a/spec/cypress/integration/selected_items.js b/spec/cypress/integration/selected_items.js
new file mode 100644
index 0000000000..c4c68b0fb8
--- /dev/null
+++ b/spec/cypress/integration/selected_items.js
@@ -0,0 +1,411 @@
+/*
+ * Copyright 2011-2025, The Trustees of Indiana University and Northwestern
+ *   University.  Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ---  END LICENSE_HEADER BLOCK  ---
+ */
+
+import { navigateToManageContent } from '../support/navigation';
+import CollectionPage from '../pageObjects/collectionPage';
+import HomePage from '../pageObjects/homePage';
+const homePage = new HomePage();
+import {
+  navigateToManageContent,
+  selectLoggedInUsersOnlyAccess,
+  performSearch,
+} from '../support/navigation';
+
+context('Selected Items', () => {
+  const collectionPage = new CollectionPage();
+
+  var collection_title = `Automation collection title ${
+    Math.floor(Math.random() * 10000) + 1
+  }`;
+  const new_collection_title = `Automation collection title ${
+    Math.floor(Math.random() * 10000) + 1
+  }`;
+  var media_object_title = `Automation Item title ${
+    Math.floor(Math.random() * 100000) + 1
+  }`;
+  var new_media_object_title = `Automation Item title ${
+    Math.floor(Math.random() * 100000) + 1
+  }`;
+  var media_object_id;
+  var new_media_object_id;
+
+  Cypress.on('uncaught:exception', (err, runnable) => {
+    if (
+      err.message.includes(
+        "Cannot read properties of undefined (reading 'success')"
+      ) ||
+      err.message.includes(
+        "Cannot read properties of undefined (reading 'times')"
+      )
+    ) {
+      return false;
+    }
+  });
+
+  // Create collection and complex media object before all tests
+  before(() => {
+    cy.login('administrator');
+    navigateToManageContent();
+
+    // Create collection with public access
+    collectionPage.createCollection(
+      { title: collection_title },
+      { setPublicAccess: false }
+    );
+
+    // Navigate to the collection and create complex media object
+    collectionPage.navigateToCollection(collection_title);
+
+    collectionPage.createItem(media_object_title, {
+      publish: true,
+      addStructure: true,
+    });
+
+    // Get the media object ID from the alias
+    cy.get('@mediaObjectId').then((id) => {
+      media_object_id = id;
+    });
+  });
+  // Clean up after all tests - ITEM FIRST, THEN COLLECTION
+  after(() => {
+    cy.login('administrator');
+
+    // Then delete the collection
+    collectionPage.deleteCollectionByName(collection_title);
+    collectionPage.deleteCollectionByName(new_collection_title);
+  });
+});
+
+it('Verify the user is able to update Access Control for all selected items - Special Access - Avalon User - @T64227f02', () => {
+  // Select the created media object
+  cy.login('administrator');
+  homePage.getBrowseNavButton().click();
+  performSearch(media_object_title);
+  cy.get('[data-testid="bookmark-toggle"]').first().click({ force: true });
+  cy.visit(`/bookmarks`);
+  cy.get('a[href="/bookmarks/update_access_control"]').click();
+  //check that the item is checked on bookmarks page
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  // Update Access Control to Special Access - Avalon User
+  cy.get('[data-testid="autocomplete-user-input"]')
+    .clear()
+    .type('user@example.com');
+
+  // click the matching suggestion
+  cy.get('[data-testid="user-popup"]')
+    .should('be.visible')
+    .contains('li', 'user@example.com')
+    .click();
+  //click on add button
+  cy.get('[data-testid="bookmark-add-user"]').click();
+  // Expect success alert
+  cy.get('[data-testid="alert"]')
+    .should('be.visible')
+    .and('contain', 'Access controls are being updated on 1 item.');
+
+  // Verify that user@example.com has access to the media object
+  homePage.logout();
+  //Login as a user who is not a staff to collection to validate the result
+  cy.login('user');
+  cy.visit('/');
+  cy.intercept('GET', '/media_objects/*').as('getmediaobject');
+  cy.visit('/media_objects/' + media_object_id);
+  cy.wait('@getmediaobject').then((interception) => {
+    expect(interception.response.statusCode).to.eq(200);
+  });
+});
+
+it('Verify that the users without permission to update access control is not able to update Access Control from selected items- @@Tea7101fb', () => {
+  cy.login('user');
+  // Select the media object for which the access was given in previous test
+  homePage.getBrowseNavButton().click();
+  performSearch(media_object_title);
+  cy.get('[data-testid="bookmark-toggle"]').first().click({ force: true });
+  //Verify the count has increased to 1
+  cy.get('a[href="/bookmarks"]')
+    .find('[data-testid="bookmark-counter"]')
+    .should('have.text', '1');
+  cy.visit(`/bookmarks`);
+  // Verify that the Update Access Control button is not visible
+  cy.get('a[href="/bookmarks/update_access_control"]').should('not.exist');
+});
+
+it('Verify if the user is able to move items to a new collection- @@T8b339069', () => {
+  cy.login('administrator');
+  // Create a new collection to move the item into
+  navigateToManageContent();
+  collectionPage.createCollection(
+    { title: new_collection_title },
+    { setPublicAccess: false }
+  );
+  //
+  cy.visit(`/bookmarks`);
+  //check that the item is checked on bookmarks page
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  //Click on Move
+  cy.get('a[href="/bookmarks/move"]').click();
+  //Select the new collection and move
+  cy.get('[data-testid="bookmark-collection-dropdown"] option')
+    .contains(new_collection_title)
+    .should('exist');
+
+  cy.get('[data-testid="bookmark-collection-dropdown"]').select(
+    new_collection_title,
+    { force: true }
+  );
+  cy.get('[data-testid="bookmark-move"]').click();
+  // The alert
+  cy.get('[data-testid="alert"]')
+    .should('be.visible')
+    .and(
+      'contain',
+      `One item is being moved to collection ${new_collection_title}.`
+    );
+  // Verify that the item is now in the new collection
+  collectionPage.navigateToCollection(new_collection_title);
+  //Click on List All Items
+  cy.get('[data-testid="collection-list-all-item-btn"]').click();
+  // Verify the media object is present in the new collection
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .should('be.visible')
+    .and('contain', media_object_title);
+});
+it('Verify if the user is able to publish items - @Tfd4e6b7b', () => {
+  cy.login('administrator');
+  cy.visit(`/bookmarks`);
+  //check that the item is checked on bookmarks page
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  //Click on Publish button for user to access the item
+  cy.get('a[href="/bookmarks/publish"]').click();
+  //Verify the alert for publishing
+  cy.get('[data-testid="alert"]')
+    .should('be.visible')
+    .and('contain', 'One item is being published.');
+  //Verify that the item is published by visiting the media object page
+  cy.visit('/media_objects/' + media_object_id);
+  // Verify that the Unpublish button is visible
+  cy.get('[data-testid="media-object-unpublish-btn"]')
+    .should('be.visible')
+    .and('have.text', 'Unpublish');
+});
+it('Verify users without permission is not able to publish items from selected items - @T520b6f98', () => {
+  cy.login('user');
+  // Select the media object for which the access was given in previous test
+  cy.visit(`/bookmarks`);
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  // Verify that the Publish and Unpublish is not visible
+  cy.get('a[href="/bookmarks/publish"]').should('not.exist');
+  cy.get('a[href="/bookmarks/unpublish"]').should('not.exist');
+});
+
+it('Verify users without permission is not able to delete items from selected items - @Tbe94df87', () => {
+  cy.login('user');
+  // Select the media object for which the access was given in previous test
+  cy.visit(`/bookmarks`);
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  // Verify that the Delete button is not visible
+  cy.get('a[href="/bookmarks/delete"]').should('not.exist');
+});
+
+it('Verify removing items from selected items list - @Td13db335', () => {
+  cy.login('user');
+  // Select the media object for which the access was given in previous test
+  cy.visit(`/bookmarks`);
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  // Verify that the Delete button is not visible
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .uncheck({ force: true });
+  //Refresh the page and verify the item is removed from the list
+  cy.visit(`/bookmarks`);
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`).should(
+    'not.be.visible'
+  );
+});
+
+it('Verify if the user is able to merge items - @Tb96ea8d8', () => {
+  cy.login('administrator');
+  // Select the media object for which the access was given in previous test
+  cy.visit(`/bookmarks`);
+  // Create an item to merge with the existing item
+  // Navigate to the collection and create complex media object
+  collectionPage.navigateToCollection(new_collection_title);
+
+  collectionPage.createItem(new_media_object_title, {
+    publish: true,
+    addStructure: true,
+  });
+
+  // Get the media object ID from the alias
+  cy.get('@mediaObjectId').then((id) => {
+    new_media_object_id = id;
+  });
+  // Select the new media object
+  homePage.getBrowseNavButton().click();
+  performSearch(media_object_title);
+  cy.get('[data-testid="bookmark-toggle"]').first().click({ force: true });
+  cy.visit(`/bookmarks`);
+  cy.get('a[href="/bookmarks/update_access_control"]').click();
+  //check that the item is checked on bookmarks page
+  cy.get(`[data-testid="browse-document-title-${new_media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  //Check both items are selected
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  cy.get(`[data-testid="browse-document-title-${new_media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  //Click on Merge and merge the second item into the first item
+  cy.get('a[href="/bookmarks/merge"]').click();
+  cy.get(`[data-testid="merge-media-object-${media_object_id}"]`).click({
+    force: true,
+  });
+  //Verify the alert for merging
+  cy.get('[data-testid="alert"]')
+    .should('be.visible')
+    .and('contain', 'Merging 1 items into')
+    .and('contain', media_object_title);
+  //Visit the first media object page to verify the merged content
+  cy.visit('/media_objects/' + media_object_id);
+  cy.get('[data-testid="tree-item"]').should('have.length', 2);
+  //The second media object should no longer be accessible
+  cy.intercept('GET', '/media_objects/*').as('getmediaobject');
+  cy.visit('/media_objects/' + new_media_object_id);
+  cy.wait('@getmediaobject').then((interception) => {
+    expect(interception.response.statusCode).to.eq(410);
+  });
+  cy.get('h2').first().should('have.text', 'Item Deleted');
+  cy.get('p')
+    .eq(0)
+    .should(
+      'have.text',
+      'The item you requested has been deleted from the system. If this is not expected, contact your support staff.'
+    );
+});
+it('Verify if the user is able to delete items - @T47a94cdc', () => {
+  cy.login('administrator');
+  // Verify the media object is selected to be deleted
+  cy.visit(`/bookmarks`);
+  cy.get(`[data-testid="browse-document-title-${media_object_id}"]`)
+    .closest('article')
+    .find('[data-testid="bookmark-toggle"]')
+    .first()
+    .then(($cb) => {
+      if (!$cb.prop('checked')) {
+        cy.wrap($cb).check({ force: true });
+      }
+    })
+    .should('be.checked');
+  cy.get('a[href="/bookmarks/delete"]').click();
+  //confirm delete
+  cy.contains('button', 'Yes, I am Sure').click();
+  // The alert
+  cy.get('[data-testid="alert"]')
+    .should('be.visible')
+    .and('contain', 'One item is being deleted.');
+  // Verify that the item is deleted by visiting the media object page
+  cy.intercept('GET', '/media_objects/*').as('getmediaobject');
+  cy.visit('/media_objects/' + media_object_id);
+  cy.wait('@getmediaobject').then((interception) => {
+    expect(interception.response.statusCode).to.eq(410);
+  });
+  cy.get('h2').first().should('have.text', 'Item Deleted');
+  cy.get('p')
+    .eq(0)
+    .should(
+      'have.text',
+      'The item you requested has been deleted from the system. If this is not expected, contact your support staff.'
+    );
+});

From a1605c5ec65147db043ae77013dadf608a4e73f8 Mon Sep 17 00:00:00 2001
From: Akanksha Bankhele <bankheleakanksha@gmail.com>
Date: Wed, 5 Nov 2025 11:11:12 -0500
Subject: [PATCH 2/3] resolving conflicts changing it back

---
 app/views/checkouts/_return_all.html.erb |  8 -----
 app/views/checkouts/index.html.erb       | 41 ------------------------
 spec/cypress/integration/cdl_spec.js     |  4 ++-
 3 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/app/views/checkouts/_return_all.html.erb b/app/views/checkouts/_return_all.html.erb
index 3c9592a701..c9766c6aad 100644
--- a/app/views/checkouts/_return_all.html.erb
+++ b/app/views/checkouts/_return_all.html.erb
@@ -13,17 +13,9 @@ Unless required by applicable law or agreed to in writing, software distributed
   specific language governing permissions and limitations under the License.
 ---  END LICENSE_HEADER BLOCK  ---
 %>
-<<<<<<< HEAD:app/views/checkouts/_return_all.html.erb
 
 <% if Checkout.active_for_user(current_user.id).count > 1 || current_ability.is_administrator? %>
   <div class="text-start">
     <%= link_to 'Return All', main_app.return_all_checkouts_path , class: 'btn btn-primary btn-md', method: :patch, data: { confirm: 'Are you sure you want to return all items?' } %>
   </div>
 <% end %>
-=======
-<% # container for display inactive checkouts checkbox -%>
-<div class="col-sm-3 offset-9 col-lg-3 offset-lg-10">
-  <%= check_box_tag :inactive_checkouts, data: { testid: 'inactive-checkouts-toggle' } %>
-  <%= label_tag :inactive_checkouts, 'Display Returned Items', class: 'fw-bold' %>
-</div>
->>>>>>> d2a17bdeb (high priority test cases):app/views/checkouts/_inactive_checkout.html.erb
diff --git a/app/views/checkouts/index.html.erb b/app/views/checkouts/index.html.erb
index 77fbe99fa3..a31dc32a57 100644
--- a/app/views/checkouts/index.html.erb
+++ b/app/views/checkouts/index.html.erb
@@ -26,45 +26,4 @@ Unless required by applicable law or agreed to in writing, software distributed
   <% else %>
     <p>No matching records found.</p>
   <% end %>
-<<<<<<< HEAD
-=======
-
-  <table id="checkouts-table" class="table table-striped datatable" data-testid="checkouts-table">
-    <thead>
-      <tr>
-        <% if current_ability.is_administrator? %>
-          <th>User</th>
-        <% end %>
-        <th>Media object</th>
-        <th>Checkout time</th>
-        <th>Return time</th>
-        <th>Time remaining</th>
-        <th data-orderable="false">
-          <% if Checkout.active_for_user(current_user.id).count > 1 || current_ability.is_administrator? %>
-              <%= link_to 'Return All', main_app.return_all_checkouts_path , class: 'btn btn-primary btn-xs', method: :patch, data: { confirm: 'Are you sure you want to return all items?' } %>
-          <% end %>
-        </th>
-      </tr>
-    </thead>
-
-    <tbody>
-      <% @checkouts.each do |checkout| %>
-        <tr data-testid="checkout-row">
-          <% if current_ability.is_administrator? %>
-            <td><%= checkout.user.user_key %></td>
-          <% end %>
-          <td><%= link_to checkout.media_object.title, main_app.media_object_url(checkout.media_object) ,data: { testid: "checkout-media-title" }%></td>
-          <td><span data-utc-time="<%= checkout.checkout_time.iso8601 %>" /></td>
-          <td><span data-utc-time="<%= checkout.return_time.iso8601 %>" /></td>
-          <td><%= distance_of_time_in_words(checkout.return_time - DateTime.current) %></td>
-          <td>
-            <% if checkout.return_time > DateTime.current %>
-              <%= link_to 'Return', return_checkout_url(checkout), class: 'btn btn-outline btn-xs', method: :patch, data: { testid: 'checkout-return' } %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
->>>>>>> d2a17bdeb (high priority test cases)
 </div>
diff --git a/spec/cypress/integration/cdl_spec.js b/spec/cypress/integration/cdl_spec.js
index 0e1c6269c0..cdb992e990 100644
--- a/spec/cypress/integration/cdl_spec.js
+++ b/spec/cypress/integration/cdl_spec.js
@@ -233,7 +233,9 @@ it('Verify that the checkouts page displays the list of borrowed items - @T33474
   cy.login('administrator');
   cy.visit(`/checkouts`);
   // Click on display returned items checkbox
-  cy.get('[data-testid="inactive-checkouts-toggle"]').click();
+  cy.contains('label', 'Display Returned Items')
+    .prev('input[type="checkbox"]')
+    .click();
   //search for the returned item
   cy.get('input[type="search"][aria-controls="checkouts-table"]')
     .clear()

From 633f8188f7fddbb5804024cc3f1d7684ecca76ed Mon Sep 17 00:00:00 2001
From: Akanksha Bankhele <bankheleakanksha@gmail.com>
Date: Wed, 5 Nov 2025 12:13:49 -0500
Subject: [PATCH 3/3] Changed data-testids for cdl

---
 .../components/tables/CheckoutsTable.jsx      |  2 +-
 spec/cypress/integration/cdl_spec.js          | 39 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/app/javascript/components/tables/CheckoutsTable.jsx b/app/javascript/components/tables/CheckoutsTable.jsx
index 7759e8db6b..0c49dc97a0 100644
--- a/app/javascript/components/tables/CheckoutsTable.jsx
+++ b/app/javascript/components/tables/CheckoutsTable.jsx
@@ -149,7 +149,7 @@ const CheckoutsTable = ({ url, isAdmin, returnAll }) => {
 
       displayReturnedItemsHTML: (
         <Col span={3} offset={9} className='mb-2 text-end text-nowrap'>
-          <input type='checkbox' checked={showReturned} id='inactive_checkouts' onChange={refreshData} />
+          <input type='checkbox' checked={showReturned} id='inactive_checkouts' data-testid='bookmark-display-returned-items-chkbox' onChange={refreshData} />
           <label className='fw-bold ms-1' htmlFor='inactive_checkouts'>Display Returned Items</label>
         </Col>
       )
diff --git a/spec/cypress/integration/cdl_spec.js b/spec/cypress/integration/cdl_spec.js
index cdb992e990..526ddc5a7b 100644
--- a/spec/cypress/integration/cdl_spec.js
+++ b/spec/cypress/integration/cdl_spec.js
@@ -149,25 +149,21 @@ it('Verify returning items from checkouts page - @T73acc852', () => {
   cy.login('administrator');
   // Checkout option exists
   cy.visit(`/checkouts`);
-  // find the row for this media object
-  cy.get('[data-testid="checkout-row"]')
-    .contains('[data-testid="checkout-media-title"]', media_object_title)
+  //find the row with the media object title
+  cy.get('[data-testid="checkouts-table-body"]')
+    .contains('a', media_object_title)
     .should('be.visible')
-    .closest('[data-testid="checkout-row"]')
+    .closest('tr')
     .as('row');
 
-  // verify Return exists in that row, then click it
-  cy.get('@row')
-    .find('[data-testid="checkout-return"]')
-    .should('be.visible')
-    .click();
-  // Verify that the item is no longer in the checkouts list
-  cy.get('[data-testid="checkouts-table"]').within(() => {
-    cy.contains(
-      '[data-testid="checkout-media-title"]',
-      media_object_title
-    ).should('not.exist');
-  });
+  // Verify "Return" button exists and click it
+  cy.get('@row').find('a[href*="/return"]').should('be.visible').click();
+
+  // Verify the item is no longer listed in the table
+  cy.get('[data-testid="checkouts-table-body"]').should(
+    'not.contain',
+    media_object_title
+  );
 
   // Verify the counter on the checkouts nav link is updated
   cy.get('[data-testid="checkout-counter"]')
@@ -233,16 +229,17 @@ it('Verify that the checkouts page displays the list of borrowed items - @T33474
   cy.login('administrator');
   cy.visit(`/checkouts`);
   // Click on display returned items checkbox
-  cy.contains('label', 'Display Returned Items')
-    .prev('input[type="checkbox"]')
+  cy.get('[data-testid="bookmark-display-returned-items-chkbox"]')
+    .should('exist')
     .click();
   //search for the returned item
   cy.get('input[type="search"][aria-controls="checkouts-table"]')
     .clear()
     .type(media_object_title);
   // Verify that the returned item is displayed
-  cy.get('[data-testid="checkout-row"]')
-    .contains('[data-testid="checkout-media-title"]', media_object_title)
+  cy.get('[data-testid="checkouts-table-body"]')
+    .contains('a', media_object_title)
     .should('be.visible')
-    .closest('[data-testid="checkout-row"]');
+    .closest('tr')
+    .as('row');
 });