Merge 4fc0401 into 6df3a4f

berkmancenter · Feb 1, 2019 · 88823b3 · 88823b3
2 parents 6df3a4f + 4fc0401
commit 88823b3
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 49 deletions.
diff --git a/app/views/notices/search/_date_range_filter.html.erb b/app/views/notices/search/_date_range_filter.html.erb
@@ -6,7 +6,7 @@
     <li class="facet"><a href="javascript:void(0);" data-facet-name="<%= date_range_filter.parameter %>" data-value="">All</a></li>
     <% results[date_range_filter.parameter.to_s]['buckets'].each do |range| %>
       <li class="facet <%= facet_active_indicator(date_range_filter.parameter, range_facet_param(range)) %>" name="<%= date_range_filter.parameter %>" >
-      <a href="javascript:void(0);" data-facet-name="<%= date_range_filter.parameter %>" data-value="<%= range_facet_param(range) %>">Since <%= formatted_facet_range_time(range['from']) %><span class="total-count"><%= range[:doc_count] %> Results</span></a>
+      <a href="javascript:void(0);" data-facet-name="<%= date_range_filter.parameter %>" data-value="<%= range_facet_param(range) %>">Since <%= formatted_facet_range_time(range['from']) %> <span class="total-count"><%= range[:doc_count] %> Results</span></a>
       </li>
     <% end %>
   </ol>

diff --git a/app/views/notices/search/index.html.erb b/app/views/notices/search/index.html.erb
@@ -19,19 +19,17 @@
         <span class="total-entries">Found <%= @searchdata.results.total %> results</span>
         <div class="dropdown sort-order">
           Sort by: <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)"><%= sort_order_label(params[:sort_by]) %></a>
-          <% cache 'sortings' do %>
-            <ol class="dropdown-menu" role="menu">
-              <% Notice::SORTINGS.each do |sorting| %>
-                <li class="facet">
-                <%=
-                  link_to(
-                    sorting.label, '#', 'data-value': sorting.key,
-                    'data-label': sorting.label
-                  ) %>
-                </li>
-              <% end %>
-            </ol>
-          <% end %>
+          <ol class="dropdown-menu" role="menu">
+            <% Notice::SORTINGS.each do |sorting| %>
+              <li class="facet">
+              <%=
+                link_to(
+                  sorting.label, '#', 'data-value': sorting.key,
+                  'data-label': sorting.label
+                ) %>
+              </li>
+            <% end %>
+          </ol>
         </div>
       </div>
     </header>

diff --git a/app/views/shared/_header_search.html.erb b/app/views/shared/_header_search.html.erb
@@ -10,24 +10,18 @@
       <%= render 'shared/search' %>
     </div>
     <%= form_tag(notices_search_index_path, method: :get) do %>
-      <%# Don't cache the entire page, because caching the form caches its
-          authenticity token, which will break that security feature. However,
-          do cache this section; it's static, and dynamically generating it
-          like this results in a lot of rendering calls. %>
-      <% cache 'advanced_search' do %>
-        <div class="container advanced-search">
-          <div class="width-wrapper">
-            <h5>Advanced Search: <span>add additional search queries<span></h5>
-            <% Notice::SEARCHABLE_FIELDS.each do |field| %>
-              <%= render field %>
-            <% end %>
-            <a id="duplicate-field" href="javascript:void(0);" class="add-group">Add more</a>
-            <div class="resubmit">
-              <button class="button">Advanced Search</button>
-            </div>
+      <div class="container advanced-search">
+        <div class="width-wrapper">
+          <h5>Advanced Search: <span>add additional search queries<span></h5>
+          <% Notice::SEARCHABLE_FIELDS.each do |field| %>
+            <%= render field %>
+          <% end %>
+          <a id="duplicate-field" href="javascript:void(0);" class="add-group">Add more</a>
+          <div class="resubmit">
+            <button class="button">Advanced Search</button>
           </div>
         </div>
-      <% end %>
+      </div>
       <%= hidden_field_tag(:sort_by, params[:sort_by], class: 'sort_by_field') %>
     <% end %>
   </div>

diff --git a/spec/integration/notice_search_spec.rb b/spec/integration/notice_search_spec.rb
@@ -389,6 +389,43 @@
     expect { submit_search('') }.not_to raise_error
   end
 
+  scenario 'cache does not break date filter', cache: true do
+    last_year = Time.at(
+      Time.now.beginning_of_day - 12.months
+    ).to_datetime.to_s(:simple)
+    last_month = Time.at(
+      Time.now.beginning_of_day - 1.month
+    ).to_datetime.to_s(:simple)
+
+    create(:dmca, title: 'Ancient History', date_received: 100.days.ago)
+    create(:dmca, title: 'Modern History', date_received: 1.day.ago)
+    index_changed_instances
+
+    search_for(term: 'history')
+    expect(
+      find('a', text: "Since #{last_year}").find('span').text
+    ).to eq '2 Results'
+    expect(
+      find('a', text: "Since #{last_month}").find('span').text
+    ).to eq '1 Results'
+
+    search_for(term: 'ancient')
+    expect(
+      find('a', text: "Since #{last_year}").find('span').text
+    ).to eq '1 Results'
+    expect(
+      find('a', text: "Since #{last_month}").find('span').text
+    ).to eq '0 Results'
+
+    search_for(term: 'modern')
+    expect(
+      find('a', text: "Since #{last_year}").find('span').text
+    ).to eq '1 Results'
+    expect(
+      find('a', text: "Since #{last_month}").find('span').text
+    ).to eq '1 Results'
+  end
+
   private
 
   def expect_search_to_not_find(term, notice)

diff --git a/spec/support/matchers/facet_with_value.rb b/spec/support/matchers/facet_with_value.rb