From ee674991eafbeed9d14ccb4cf3959f87f2a3f2dc Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 21 Jul 2023 15:18:32 +0100 Subject: [PATCH] Remove ordering in search, fix tests --- app/services/filter_manager.rb | 2 +- spec/views/organisations/schemes.html.erb_spec.rb | 5 +++++ spec/views/schemes/index.html.erb_spec.rb | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/services/filter_manager.rb b/app/services/filter_manager.rb index f9ae7fe26..a473cf271 100644 --- a/app/services/filter_manager.rb +++ b/app/services/filter_manager.rb @@ -58,7 +58,7 @@ class FilterManager schemes = schemes.public_send("filter_by_#{category}", values, user) end - schemes.order(created_at: :desc) + schemes end def serialize_filters_to_session(specific_org: false) diff --git a/spec/views/organisations/schemes.html.erb_spec.rb b/spec/views/organisations/schemes.html.erb_spec.rb index 5c4bff422..484c197cd 100644 --- a/spec/views/organisations/schemes.html.erb_spec.rb +++ b/spec/views/organisations/schemes.html.erb_spec.rb @@ -4,10 +4,15 @@ RSpec.describe "organisations/schemes.html.erb" do context "when data provider" do let(:user) { build(:user) } + before do + session[:schemes_filters] = {}.to_json + end + it "does not render button to create schemes" do assign(:organisation, user.organisation) assign(:pagy, Pagy.new(count: 0, page: 1)) assign(:schemes, []) + assign(:filter_type, "schemes") allow(view).to receive(:current_user).and_return(user) diff --git a/spec/views/schemes/index.html.erb_spec.rb b/spec/views/schemes/index.html.erb_spec.rb index 86a8610c0..ce06177e3 100644 --- a/spec/views/schemes/index.html.erb_spec.rb +++ b/spec/views/schemes/index.html.erb_spec.rb @@ -4,9 +4,14 @@ RSpec.describe "schemes/index.html.erb" do context "when data provider" do let(:user) { build(:user) } + before do + session[:schemes_filters] = {}.to_json + end + it "does not render button to create schemes" do assign(:pagy, Pagy.new(count: 0, page: 1)) assign(:schemes, []) + assign(:filter_type, "schemes") allow(view).to receive(:current_user).and_return(user)