Merge pull request #5242 from rubyforgood/sort-milage

Sort mileage rates by effective_dates
rubyforgood · Sep 27, 2023 · 483a192 · 483a192
2 parents a8f9ca8 + 5c2d091
commit 483a192
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/controllers/mileage_rates_controller.rb b/app/controllers/mileage_rates_controller.rb
@@ -4,7 +4,7 @@ class MileageRatesController < ApplicationController
 
   def index
     authorize :application, :see_mileage_rate?
-    @mileage_rates = MileageRate.where(casa_org: current_organization)
+    @mileage_rates = MileageRate.where(casa_org: current_organization).order(effective_date: :asc)
   end
 
   def new

diff --git a/spec/controllers/mileage_rates_controller_spec.rb b/spec/controllers/mileage_rates_controller_spec.rb
@@ -0,0 +1,14 @@
+require "rails_helper"
+
+RSpec.describe MileageRatesController, type: :controller do
+  describe "#index" do
+    it "render the mileage rates by effective date in ascending order" do
+      mileage_rate1 = FactoryBot.create(:mileage_rate, effective_date: Date.new(2023, 3, 1))
+      mileage_rate2 = FactoryBot.create(:mileage_rate, effective_date: Date.new(2023, 1, 1))
+      mileage_rate3 = FactoryBot.create(:mileage_rate, effective_date: Date.new(2023, 2, 1))
+      mileage_rates = MileageRate.order(effective_date: :asc)
+      get :index
+      expect(mileage_rates).to eq([mileage_rate2, mileage_rate3, mileage_rate1])
+    end
+  end
+end