Ada 748 (#8)

davezuckerman · web-flow · commit 5f1781f01588 · 2026-03-18T14:55:45.000-07:00
* ADA-748 element labels

* changed title in header

* changed test to accommodate view changes

* fixed rubocop issue

* changed rspec error for undefined method

* disabled RSpec/ExampleLength: in spec
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Early Arrivals Search (EARS)</title>
+  <title>Early Arrivals Records Search (EARS)</title>
   <%= stylesheet_link_tag :application %>
   <%= csrf_meta_tags %>
   <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
diff --git a/app/views/search_casefiles/_form.html.erb b/app/views/search_casefiles/_form.html.erb
@@ -1,9 +1,11 @@
 <%= form_for(@searchcase, :html => { :multipart => true }) do |f| %>
 
-		<p> 
-			<%= f.label :searchterm, "Enter query:" %><br />
-    	<%= f.text_field :LASTNAME %><br />
- 		</p> 
+		<p>
+			<%= f.label :LASTNAME do %>
+				Enter query:<br />
+				<%= f.text_field :LASTNAME, placeholder: 'Enter a last name' %>
+			<% end %>
+		</p>
 
   
     <%= f.submit %>
diff --git a/app/views/searchcase/display.html.erb b/app/views/searchcase/display.html.erb
@@ -4,14 +4,14 @@
 	<h3>Immigration record:</h3>
 	  <%= form_tag(action="/searchcase/display", method: "get") do %>
 	  <%= label_tag(:q, 'Search records') %>
-	  <%= text_field_tag(:q, params[:q], aria: { label: 'Search immigration records' }) %>
+	  <%= text_field_tag(:q, params[:q], placeholder: 'Enter a name to search', aria: { label: 'Search immigration records' }) %>
 	  <%= submit_tag("Search", :class => "search-bar") %>
   <% end %>
   </div>
 
   <%= will_paginate @return %>
   <table id='table'>
-  <caption>Search results for immigration records</caption>
+	<caption>Search results for immigration records</caption>
   <thead>
 	<tr>
 	  <th class="record_col" scope="col">Last Name</th>
diff --git a/app/views/searchcase/search.html.erb b/app/views/searchcase/search.html.erb
@@ -2,7 +2,7 @@
   <h3>Immigration record:</h3>
     <%= form_tag(action="/searchcase/display", method: "get") do %>
     <%= label_tag(:q, 'Search records') %>
-    <%= text_field_tag(:q, params[:q], aria: { label: 'Search immigration records' }) %>
+    <%= text_field_tag(:q, params[:q], placeholder: 'Enter a name to search', aria: { label: 'Search immigration records' }) %>
     <%= submit_tag("Search", :class => "search-bar") %>
 <% end %>
 
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
@@ -7,7 +7,7 @@
   describe '#index' do
     it 'renders the index template' do
       get :index
-      expect(response.body).to match(/Early Arrivals Search/)
+      expect(response.body).to match(/Early Arrivals Records Search/)
     end
   end
 end
diff --git a/spec/search_spec.rb b/spec/search_spec.rb
@@ -38,15 +38,16 @@ def generate_test_object
     scenario 'empty search shows all results' do # rubocop:disable RSpec/ExampleLength
       visit '/'
       click_button 'Search'
-      expect(page).to have_content(
-        'Last Name First Name Middle Name Age Gender ' \
-        'Port Date Ship Destination LASTNAME FIRSTNAME'
-      )
+      expect(page).to satisfy do |current_page|
+        current_page.has_content?(
+          'Search results for immigration records Last Name First Name Middle Name Age Gender Port Date Ship Destination'
+        ) && current_page.has_css?('table#table tbody tr')
+      end
     end
 
     scenario 'Search query yields intended results' do
       visit '/'
-      find('#q').set('DOG')
+      find('#q').set('ZZZQUNOMATCH12345')
       click_button 'Search'
       expect(page).to have_content('query returned 0 results')
     end
@@ -55,13 +56,15 @@ def generate_test_object
   context 'when viewing record display', type: :feature do
     scenario 'Display Shows intended view' do
       visit '/'
+      find('#q').set('LASTNAME')
       click_button 'Search'
       first(:link, 'LASTNAME').click
       expect(page).to have_content('Record details below')
     end
 
     scenario 'Display Shows intended footer' do
       visit '/'
+      find('#q').set('LASTNAME')
       click_button 'Search'
       first(:link, 'LASTNAME').click
       expect(page).to have_content('© University of California Regents. All rights reserved')
