add topics_title helper and fix specs

Author: dmitrytrager

app/controllers/settings_controller.rb

@@ -1,6 +1,6 @@
 class SettingsController < ApplicationController
   def provider
-    provider = provider_scope.find_by(id: provider_params[:id])
+    provider = provider_scope.find(provider_params[:id])
     cookies.signed[:current_provider_id] = provider.id if provider
     redirect_to request.referer || root_path
   end

app/controllers/topics_controller.rb

@@ -46,7 +46,7 @@ def archive
   private
 
   def other_available_providers
-    return unless Current.user.providers.any?
+    return [] unless Current.user.providers.any?
 
     Current.user.providers.where.not(id: current_provider.id)
   end
@@ -69,8 +69,15 @@ def set_topic
   def scope
     @scope ||= if Current.user.is_admin?
       Topic.all
-    else
+    elsif current_provider.present?
       current_provider.topics
+    else
+      Current.user.topics
     end.includes(:language, :provider)
   end
+
+  def topics_title
+    current_provider.present? ? "#{current_provider.name}/topics" : "Topics"
+  end
+  helper_method :topics_title
 end

app/views/topics/index.html.erb

@@ -7,7 +7,7 @@
       <%= turbo_frame_tag "topics" do %>
         <div class="card">
           <div class="card-header d-flex justify-content-between align-items-center">
-            <h2 class="card-title"><%= current_provider.name %>'s topics</h2>
+            <h2 class="card-title"><%= topics_title %></h2>
             <%= link_to new_topic_path, class: "btn btn-primary" do %>
               <i class="bi bi-plus"></i> Add New Topic
             <% end %>

spec/requests/settings/provider_spec.rb

@@ -9,7 +9,7 @@
 
     context "when provider cannot be found" do
       it "does not update current provider" do
-        put provider_settings_url, params: { id: provider.id }
+        put provider_settings_url, params: { provider: { id: provider.id } }
 
         expect(response).to have_http_status(:not_found)
       end
@@ -21,7 +21,7 @@
       end
 
       it "updates current provider" do
-        put provider_settings_url, params: { id: provider.id }
+        put provider_settings_url, params: { provider: { id: provider.id } }
 
         signed_cookies = ActionDispatch::Request.new(Rails.application.env_config).cookie_jar