Merge pull request #6284 from avalonmediasystem/develop-8.0.1

More cypress improvements

Author: cjcolvar

app/assets/javascripts/button_confirmation.js.coffee

@@ -30,7 +30,7 @@ $ ->
     content: ->
       button = undefined
       if typeof $(this).attr('form') == "undefined"
-        button = '<a href="' + $(this).attr('href') + '" class="btn btn-sm btn-danger btn-confirm" data-method="delete" rel="nofollow">Yes, Delete</a>'
+        button = '<a href="' + $(this).attr('href') + '" class="btn btn-sm btn-danger btn-confirm" data-method="delete" rel="nofollow" data-testid="table-view-delete-confirmation-btn">Yes, Delete</a>'
       else
         button = '<input class="btn btn-sm btn-danger btn-confirm" form="' + $(this).attr('form') + '" type="submit" value="Yes, Delete">'
         $('#' + $(this).attr('form')).find('[name=\'_method\']').val 'delete'

app/javascript/components/MediaObjectRamp.jsx

@@ -100,6 +100,8 @@ const Ramp = ({
                           aria-expanded="false"
                           aria-controls="timelineModal"
                           disabled={true}
+                          data-testid="media-object-create-timeline-btn"
+                        
                         >
                           Create Timeline
                         </button>
@@ -164,7 +166,7 @@ const Ramp = ({
         <Col sm={12} md={3} lg={4} className="ramp--tabs-panel">
           {cdl.enabled && <div dangerouslySetInnerHTML={{ __html: cdl.destroy }} />}
           <Tabs>
-            <Tab eventKey="details" title="Details">
+            <Tab eventKey="details" title="Details" >
               <MetadataDisplay showHeading={false} displayTitle={false} />
             </Tab>
             {(cdl.can_stream && sections_count != 0 && has_transcripts) &&

app/javascript/components/ReactButtonContainer.jsx

@@ -72,6 +72,7 @@ class ReactButtonContainer extends Component {
         <button
           className="btn btn-primary btn-struct btn-edit mr-1"
           onClick={this.handleShow}
+          data-testid="media-object-edit-structure-react-btn"
         >
           Edit Structure
         </button>

app/views/admin/collections/show.html.erb

@@ -84,7 +84,7 @@ Unless required by applicable law or agreed to in writing, software distributed
     </div>
   </div>
   <div class="well-vertical-spacer">
-    <%= link_to('Create An Item', new_media_object_path(collection_id: @collection.id), class: 'btn btn-primary') if can? :create, MediaObject %>
+    <%= 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') %>
     <%= button_tag('Edit Collection Info', class: 'btn btn-outline', data: {toggle:"modal", target:"#new_collection", testid:"collection-edit-collection-info"}) if can? :update, @collection %>
   </div>

app/views/catalog/_document_list.html.erb

@@ -15,7 +15,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 %>
 <% # container for all documents in index list view -%>
 <% view_config = local_assigns[:view_config] || blacklight_config&.view_config(document_index_view_type) %>
-<div id="documents" class="documents-<%= document_index_view_type %>">
+<div id="documents" class="documents-<%= document_index_view_type %>" data-testid="browse-results-list">
   <% if render_bookmarks_control? && documents.count>1 %> 
     <%= render "select_all" %>
   <% end %>

app/views/devise/registrations/new.html.erb

@@ -20,17 +20,17 @@ Unless required by applicable law or agreed to in writing, software distributed
   <h3 align='center'>Sign up</h3>
 
   <%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), inline_errors: false) do |f| %>
-    <%= f.text_field :username, label_class: 'font-weight-bold', autofocus: true, autocomplete: 'username' %>
-    <%= f.email_field :email, label_class: 'font-weight-bold', autofocus: true, autocomplete: 'email' %>
+    <%= f.text_field :username, label_class: 'font-weight-bold', autofocus: true, autocomplete: 'username', data:{testid:'sign-up-username'} %>
+    <%= f.email_field :email, label_class: 'font-weight-bold', autofocus: true, autocomplete: 'email', data:{testid:'sign-up-email'} %>
 
     <% if @minimum_password_length %>
-      <%= f.password_field :password, label_class: 'font-weight-bold', help: "#{@minimum_password_length} characters minimum", autocomplete: 'off' %>
+      <%= f.password_field :password, label_class: 'font-weight-bold', help: "#{@minimum_password_length} characters minimum", autocomplete: 'off', data:{testid:'sign-up-password'} %>
     <% else %>
       <%= f.password_field :password, label_class: 'font-weight-bold', autocomplete: 'off' %>
     <% end %>
 
-    <%= f.password_field :password_confirmation, label_class: 'font-weight-bold', autocomplete: 'off' %>
-    <%= f.submit "Sign up", class: 'btn btn-primary' %>
+    <%= f.password_field :password_confirmation, label_class: 'font-weight-bold', autocomplete: 'off', data:{testid:'sign-up-password-confirm'} %>
+    <%= f.submit "Sign up", class: 'btn btn-primary', data:{testid:'sign-up-btn'} %>
   <% end %>
 
   <%= render "devise/shared/links" %>

app/views/media_objects/_access_control.html.erb

@@ -59,27 +59,27 @@ Unless required by applicable law or agreed to in writing, software distributed
   </div>
 </div>
 
-<div class="card item-access">
+<div class="card item-access" data-testid="media-object-item-access">
   <div class="card-header">
     <h3 class="card-title">Item access</h3>
   </div>
   <div class="card-body">
     <div class="form-group">
       <div class="form-check">
         <label>
-          <%= radio_button_tag :visibility, 'public', (@visibility == 'public') %>
+          <%= radio_button_tag :visibility, 'public', (@visibility == 'public'),data:{testid: 'media-object-general-public'} %>
           Available to the general public
         </label>
       </div>
       <div class="form-check">
         <label>
-          <%= radio_button_tag :visibility, 'restricted', (@visibility == 'restricted') %>
+          <%= radio_button_tag :visibility, 'restricted', (@visibility == 'restricted'), data:{testid: 'media-object-logged-in-users'} %>
           Logged in users only
         </label>
       </div>
       <div class="form-check">
         <label>
-          <%= radio_button_tag :visibility, 'private', (@visibility == 'private') %>
+          <%= radio_button_tag :visibility, 'private', (@visibility == 'private'), data:{testid: 'media-object-collection-staff-only'} %>
           Collection staff only
         </label>
       </div>

app/views/media_objects/_administrative_links.html.erb

@@ -15,14 +15,14 @@ Unless required by applicable law or agreed to in writing, software distributed
 %>
 <% if can? :update, @media_object %>
   <div id="administrative_options" class="d-inline-block">
-    <%= link_to 'Edit', edit_media_object_path(@media_object), class: 'btn btn-primary text-nowrap' %>
+    <%= link_to 'Edit', edit_media_object_path(@media_object), class: 'btn btn-primary text-nowrap', data:{testid: 'media-object-edit-btn'} %>
 
     <% if @media_object.published? %>
     <% if can?(:unpublish, @media_object) %>
-    <%= link_to 'Unpublish', update_status_media_object_path(@media_object, status:'unpublish'), method: :put, class: 'btn btn-primary' %>
+    <%= link_to 'Unpublish', update_status_media_object_path(@media_object, status:'unpublish'), method: :put, class: 'btn btn-primary', data: {testid: 'media-object-unpublish-btn'} %>
     <% end %>
     <% else %>
-    <%= link_to 'Publish', update_status_media_object_path(@media_object, status:'publish'), method: :put, class: 'btn btn-primary' %>
+    <%= link_to 'Publish', update_status_media_object_path(@media_object, status:'publish'), method: :put, class: 'btn btn-primary', data: {testid: 'media-object-publish-btn'} %>
     <% end %>
 
     <% if Settings.intercom.present? and can? :intercom_push, @media_object %>

app/views/media_objects/_file_upload.html.erb

@@ -45,7 +45,7 @@ Unless required by applicable law or agreed to in writing, software distributed
           <% @masterFiles.each do |section| %>
             <%= hidden_field_tag "master_files[#{section.id}][id]", section.id  %>
 
-            <div class="associated-files-block">
+            <div class="associated-files-block" data-testid="media-object-edit-associated-files-block">
               <div class="associated-files-top-row row">
                 <!-- Icon -->
                 <div class="col-md-9 col-xs-8">
@@ -98,7 +98,7 @@ Unless required by applicable law or agreed to in writing, software distributed
                     <% end %>
                     <span>
                       <button id="<%="edit_section_#{section.id}"%>" class="btn btn-sm btn-primary" onclick="return false;" data-toggle="collapse"
-                              data-target="<%="#collapseExample#{section.id}"%>" data-section-id="<%= section.id %>" aria-expanded="false" aria-controls="collapseExample">
+                              data-target="<%="#collapseExample#{section.id}"%>" data-section-id="<%= section.id %>" aria-expanded="false" aria-controls="collapseExample" data-testid="media-object-manage-files-edit-btn">
                         Edit
                       </button>
                     </span>
@@ -205,11 +205,11 @@ Unless required by applicable law or agreed to in writing, software distributed
 
             <div class="fileinput fileinput-new" id="file-upload" data-provides="fileinput"  style="height: 33px">
               <a href="#" class="fileinput-submit fileinput-exists btn btn-outline btn-file file-upload-buttons"
-                data-trigger="submit" data-toggle="modal" data-target="#uploading">Upload</a>
+                data-trigger="submit" data-toggle="modal" data-target="#uploading" data-testid="media-object-edit-upload-btn">Upload</a>
               <span class="btn btn-outline btn-file file-upload-buttons">
                 <span class="fileinput-new">Select file</span>
                 <span class="fileinput-exists">Change</span>
-                <input type="file" name="Filedata[]">
+                <input type="file" name="Filedata[]" data-testid="media-object-edit-select-file-btn">
               </span>
               <span class="fileinput-filename"></span>
               <a href="#" class="close fileinput-exists fileinput-close" data-dismiss="fileinput">&times;</a>

app/views/media_objects/_ingest_step.html.erb

@@ -15,7 +15,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 %>
 <li class="nav-item <%= class_for_step(@media_object, step.step) %>">
   <% if active %>
-  <%= link_to edit_media_object_path(@media_object, step: step.step), class: "nav-link" do %>
+  <%= link_to edit_media_object_path(@media_object, step: step.step), class: "nav-link", data:{testid: 'media-object-side-nav-link'} do %>
     <strong><%= step.title %></strong>
   <% end %>
   <% else %>