Fixing rpsec failures

Author: dutow

app/controllers/topics_controller.rb

@@ -23,9 +23,7 @@ def index
   def show
     messages_scope = @topic.messages.includes(:sender, reply_to: :sender)
 
-    @view_mode = 'flat'
-    @sort_order = :asc
-    @messages = messages_scope.order(created_at: @sort_order)
+    @messages = messages_scope.order(created_at: :asc)
     @message_numbers = @messages.each_with_index.to_h { |msg, idx| [msg.id, idx + 1] }
     preload_read_state!
     auto_mark_aware!

app/views/topics/show.html.slim

@@ -99,13 +99,13 @@
   .thread-notes-container
     = render "notes/note_stack", topic: @topic, message: nil, notes: thread_notes
 
-.messages-container class=(["messages-container", @view_mode, (@sort_order == :desc ? "desc" : "asc")].compact.join(" "))
+.messages-container.flat.asc
   - if user_signed_in?
     .thread-actions data-controller="thread-actions" data-thread-actions-topic-id-value=@topic.id data-thread-actions-read-all-url-value=read_all_topic_path(@topic, format: :json)
       button.button-secondary data-action="click->thread-actions#markAllRead" Mark all messages read
 
   - @messages.each do |message|
-    = render 'message', message: message, view_mode: 'flat', number: @message_numbers[message.id]
+    = render 'message', message: message, number: @message_numbers[message.id]
 
 .topic-navigation
   = link_to "← Back to Topics", topics_path, class: "back-link"

config/environments/test.rb

@@ -37,7 +37,12 @@
   config.action_mailer.delivery_method = :test
 
   # Set host to be used by links generated in mailer templates.
-  config.action_mailer.default_url_options = { host: "example.com" }
+  config.action_mailer.default_url_options = { host: "hackorum.dev" }
+
+  # Default from address for all mailers
+  config.action_mailer.default_options = {
+    from: "noreply@hackorum.dev"
+  }
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr

spec/requests/topics_spec.rb

@@ -73,51 +73,13 @@
         expect(response.body).to include(reply_message.body)
       end
 
-      it "shows threaded view by default" do
+      it "shows flat view (oldest first)" do
         get topic_path(topic)
-        expect(response.body).to include('messages-container threaded')
-      end
-
-      it "has active Threaded button" do
-        get topic_path(topic)
-        expect(response.body).to include('class="toggle-btn active"')
-      end
-
-      it "has active Oldest First button" do
-        get topic_path(topic)
-        expect(response.body).to include('class="toggle-btn active"')
-      end
-    end
-
-    context "with flat view mode" do
-      it "shows flat view" do
-        get topic_path(topic, view: 'flat')
-        expect(response).to have_http_status(:success)
         expect(response.body).to include('messages-container flat')
-      end
-
-      it "has active Flat button" do
-        get topic_path(topic, view: 'flat')
-        expect(response.body).to include('toggle-btn active')
-      end
-    end
-
-    context "with descending sort" do
-      it "shows newest first" do
-        get topic_path(topic, view: 'flat', sort: 'desc')
-        expect(response).to have_http_status(:success)
-        # Check that reply message appears before root message in HTML
-        reply_position = response.body.index(reply_message.body)
+        # root should appear before reply
         root_position = response.body.index(root_message.body)
-        expect(reply_position).to be < root_position
-      end
-    end
-
-    context "with invalid view mode" do
-      it "defaults to threaded" do
-        get topic_path(topic, view: 'invalid')
-        expect(response).to have_http_status(:success)
-        expect(response.body).to include('messages-container threaded')
+        reply_position = response.body.index(reply_message.body)
+        expect(root_position).to be < reply_position
       end
     end