Merge branch 'main' into dependabot/bundler/flipper-ui-1.4.1

Author: dorner

Gemfile.lock

@@ -128,7 +128,7 @@ GEM
     bindex (0.8.1)
     binding_of_caller (2.0.0)
       debug_inspector (>= 1.2.0)
-    bootsnap (1.20.1)
+    bootsnap (1.24.1)
       msgpack (~> 1.2)
     bootstrap (5.2.3)
       autoprefixer-rails (>= 9.1.0)

app/models/event.rb

@@ -17,7 +17,7 @@
 class Event < ApplicationRecord
   include Filterable
 
-  scope :for_organization, ->(organization_id) { where(organization_id: organization_id).order(:event_time, :updated_at) }
+  scope :for_organization, ->(organization_id) { where(organization_id: organization_id).order(:event_time, :id) }
   scope :without_snapshots, -> { where("type != 'SnapshotEvent'") }
   scope :during, ->(range) { where(events: {created_at: range}) }
   scope :by_type, ->(type) { where(type: type) }

spec/services/exports/export_partners_csv_service_spec.rb

@@ -303,9 +303,15 @@
     end
 
     it "should handle a partner with missing profile info" do
-      # The partner_profile factory defaults to populating the no_social_media_presence, primary_contact_name, and primary_contact_email fields
+      # The partner_profile factory defaults to populating the no_social_media_presence, primary_contact_name, and primary_contact_email fields.
+      # Destroy the existing profile first; otherwise the factory's `partner { Partner.first || create(:partner) }`
+      # default attaches the new profile to the same partner, briefly leaving two partner_profiles rows with the
+      # same partner_id and making the has_one lookup nondeterministic on CI.
+      partners.first.profile.destroy!
+      partners.first.reload
       partners.first.update(profile: create(
         :partner_profile,
+        partner: partners.first,
         no_social_media_presence: nil,
         primary_contact_name: nil,
         primary_contact_email: nil

spec/support/date_range_picker_shared_example.rb

@@ -51,7 +51,7 @@ def date_range_picker_select_range(range_name)
       visit subject
       date_range = "#{Time.zone.local(1919, 7, 1).to_fs(:date_picker)} - #{Time.zone.local(2020, 7, 31).to_fs(:date_picker)}"
       fill_in "filters_date_range", with: date_range
-      find(:id, 'filters_date_range').native.send_keys(:enter)
+      click_on "Filter"
       expect(page).to have_css("table tbody tr", count: 6)
     end
   end
@@ -69,7 +69,7 @@ def date_range_picker_select_range(range_name)
       visit subject
       date_range = "#{Time.zone.local(2019, 7, 1).to_fs(:date_picker)} - #{Time.zone.local(2019, 7, 31).to_fs(:date_picker)}"
       fill_in "filters_date_range", with: date_range
-      find(:id, 'filters_date_range').native.send_keys(:enter)
+      click_on "Filter"
       expect(page).to have_css("table tbody tr", count: 2)
     end
   end
@@ -79,7 +79,7 @@ def date_range_picker_select_range(range_name)
       visit subject
       date_range = "#{Time.zone.local(2019, 7, 22).to_fs(:date_picker)} - #{Time.zone.local(2019, 7, 28).to_fs(:date_picker)}"
       fill_in "filters_date_range", with: date_range
-      find(:id, 'filters_date_range').native.send_keys(:enter)
+      click_on "Filter"
       expect(page).to have_css("table tbody tr", count: 1)
     end
   end