Merge branch 'main' into dependabot/bundler/bugsnag-6.30.0

Author: dorner

Gemfile.lock

@@ -76,7 +76,7 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     afm (1.0.0)
-    annotaterb (4.20.0)
+    annotaterb (4.22.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     ast (2.4.3)
@@ -124,11 +124,11 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (4.1.1)
+    bigdecimal (4.1.2)
     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)
@@ -166,7 +166,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    csv (3.3.2)
+    csv (3.3.5)
     cuprite (0.17)
       capybara (~> 3.0)
       ferrum (~> 0.17.0)
@@ -207,22 +207,22 @@ GEM
       dotenv (= 3.2.0)
       railties (>= 6.1)
     drb (2.2.3)
-    dry-core (1.1.0)
+    dry-core (1.2.0)
       concurrent-ruby (~> 1.0)
       logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.2.0)
+    dry-inflector (1.3.1)
     dry-logic (1.6.0)
       bigdecimal
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-struct (1.8.0)
+    dry-struct (1.8.1)
       dry-core (~> 1.1)
       dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.9.0)
+    dry-types (1.9.1)
       bigdecimal (>= 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -281,11 +281,11 @@ GEM
     ffi (1.17.4-x86_64-darwin)
     ffi (1.17.4-x86_64-linux-gnu)
     filterrific (5.2.7)
-    flipper (1.4.0)
+    flipper (1.4.1)
       concurrent-ruby (< 2)
-    flipper-active_record (1.4.0)
+    flipper-active_record (1.4.1)
       activerecord (>= 4.2, < 9)
-      flipper (~> 1.4.0)
+      flipper (~> 1.4.1)
     flipper-ui (1.4.0)
       erubi (>= 1.0.0, < 2.0.0)
       flipper (~> 1.4.0)
@@ -296,7 +296,7 @@ GEM
     foreman (0.90.0)
       thor (~> 1.4)
     formatador (1.1.0)
-    geocoder (1.8.5)
+    geocoder (1.8.6)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     globalid (1.3.0)
@@ -398,7 +398,7 @@ GEM
     memory_profiler (1.1.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (6.0.3)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
     monetize (2.0.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