Fixing failing rspec tests

Failures caused by the previous changes to the layout, and one of the
issues was actually a small bug.

Author: dutow

app/controllers/activities_controller.rb

@@ -4,7 +4,7 @@ class ActivitiesController < ApplicationController
   before_action :require_authentication
 
   def index
-    @query = params[:q].to_s.strip
+    @search_query = params[:q].to_s.strip
     @activities = base_scope
                     .then { |scope| apply_query(scope) }
                     .includes(subject: [:topic, :message])
@@ -26,10 +26,10 @@ def base_scope
   end
 
   def apply_query(scope)
-    return scope if @query.blank?
+    return scope if @search_query.blank?
 
     scope.joins("INNER JOIN notes ON notes.id = activities.subject_id AND activities.subject_type = 'Note'")
-         .where("notes.body ILIKE ?", "%#{@query}%")
+         .where("notes.body ILIKE ?", "%#{@search_query}%")
   end
 
   def mark_shown_as_read!(activities)

app/controllers/topics_controller.rb

@@ -3,6 +3,7 @@ class TopicsController < ApplicationController
   before_action :require_authentication, only: [:aware, :aware_bulk, :aware_all, :read_all]
 
   def index
+    @search_query = nil
     base_query = Topic.includes(:creator)
     base_query = apply_filters(base_query)
 
@@ -84,11 +85,11 @@ def read_all
   end
 
   def search
-    @query = params[:q].to_s.strip
+    @search_query = params[:q].to_s.strip
 
-    base_query = if @query.present?
+    base_query = if @search_query.present?
                    Topic.joins(:messages)
-                        .where("topics.title ILIKE ? OR messages.body ILIKE ?", "%#{@query}%", "%#{@query}%")
+                        .where("topics.title ILIKE ? OR messages.body ILIKE ?", "%#{@search_query}%", "%#{@search_query}%")
                         .distinct
                         .includes(:creator)
                  else

app/views/activities/index.html.slim

@@ -6,7 +6,7 @@
     = button_to "Mark all read (#{@unread_count})", mark_all_read_activities_path, method: :post, class: "button-secondary"
 
 = form_with url: activities_path, method: :get, local: true, class: "activity-search" do |f|
-  = f.search_field :q, value: @query, placeholder: "Search your activity…", class: "search-input"
+  = f.search_field :q, value: @search_query, placeholder: "Search your activity…", class: "search-input"
   = f.submit "Search", class: "button-secondary"
 
 - if @activities.any?

app/views/topics/_sidebar.html.slim

@@ -4,7 +4,7 @@
       h3.sidebar-heading Search
       .sidebar-search.sidebar-content
         = form_with url: search_topics_path, method: :get, local: true do |f|
-          = f.text_field :q, placeholder: "Search topics and messages...", class: "search-input", value: @search_query
+          = f.text_field :q, placeholder: "Search topics and messages...", class: "search-input", value: search_query
           = f.submit "Search", class: "search-button"
 
     .sidebar-section
@@ -30,6 +30,3 @@
           ul.quick-filters
             - @available_note_tags.each do |tag, count|
               li = link_to "##{tag} (#{count})", topics_path(note_tag: tag)
-
-
-

app/views/topics/index.html.slim

@@ -1,6 +1,6 @@
 - content_for :title, "PostgreSQL Hackers Archive"
 
-= render partial: "sidebar", locals: { available_note_tags: @available_note_tags }
+= render partial: "sidebar", locals: { available_note_tags: @available_note_tags, search_query: @search_query }
 
 #new-topics-banner
   = render partial: "new_topics_banner", locals: { count: @new_topics_count, viewing_since: @viewing_since }

app/views/topics/search.html.slim

@@ -1,11 +1,11 @@
 - content_for :title, "Search Results"
 
-= render partial: "sidebar", locals: { available_note_tags: @available_note_tags, search_query: @query }
+= render partial: "sidebar", locals: { available_note_tags: @available_note_tags, search_query: @search_query }
 
 #new-topics-banner
-  = render partial: "new_topics_banner", locals: { count: @new_topics_count, viewing_since: @viewing_since, refresh_path: search_topics_path(q: @query) }
+  = render partial: "new_topics_banner", locals: { count: @new_topics_count, viewing_since: @viewing_since, refresh_path: search_topics_path(q: @search_query) }
 
-- if @query.present?
+- if @search_query.present?
   - if @topics.any?
     .topics-table
       table
@@ -21,7 +21,7 @@
       - if @topics.size == 25
         - last_topic = @topics.last
         - cursor = "#{last_topic.last_activity.iso8601}_#{last_topic.id}"
-        = turbo_frame_tag "pagination", src: search_topics_path(q: @query, cursor: cursor, viewing_since: @viewing_since.iso8601, format: :turbo_stream), loading: :lazy do
+        = turbo_frame_tag "pagination", src: search_topics_path(q: @search_query, cursor: cursor, viewing_since: @viewing_since.iso8601, format: :turbo_stream), loading: :lazy do
           .loading-indicator Loading more results...
   - else
     .no-results

spec/requests/topics_spec.rb

@@ -45,7 +45,7 @@
       it "returns http success with empty state" do
         get topics_path
         expect(response).to have_http_status(:success)
-        expect(response.body).to include("Scroll down to load more")
+        expect(response.body).to include("topics-table")
       end
     end
   end