Actions

.github/workflows/rspec.yml

@@ -0,0 +1,33 @@
+name: Run RSpec tests
+on: [push]
+jobs:
+    run-rspec-tests:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Set up Ruby
+              uses: ruby/setup-ruby@v1
+              with:
+                  # Not needed with a .ruby-version file
+                  ruby-version: 3.3.1
+                  # runs 'bundle install' and caches installed gems automatically
+                  bundler-cache: true
+            - name: Set up database
+              env:
+                RAILS_ENV: test
+                VAPID_PUBLIC_KEY: BCUWtDYeou4CLLwWUu44NylAkAkPYNobTJ7wuWhvjBb0YF4JhJAT_GeUrOjJvoXvcTO4ehmeCHyP0QH2mS5cyj4 # testing only
+                VAPID_PRIVATE_KEY: WE83Oc3c1GaC08gcEM2YKddtTpx0DdrjEfTHONVqR0s # testing only
+                SWAY_DATABASE_PASSWORD: testing123! # testing only
+              run: | # multi-line run command: https://stackoverflow.com/a/66809682/6410635
+                bundle exec rails db:create
+                bundle exec rails db:migrate
+                bundle exec rails db:schema:load
+                bundle exec rails db:seed
+            - name: Run tests
+              env:
+                RAILS_ENV: test
+                VAPID_PUBLIC_KEY: BCUWtDYeou4CLLwWUu44NylAkAkPYNobTJ7wuWhvjBb0YF4JhJAT_GeUrOjJvoXvcTO4ehmeCHyP0QH2mS5cyj4 # testing only
+                VAPID_PRIVATE_KEY: WE83Oc3c1GaC08gcEM2YKddtTpx0DdrjEfTHONVqR0s # testing only
+                SWAY_DATABASE_PASSWORD: testing123! # testing only
+              run: | # multi-line run command: https://stackoverflow.com/a/66809682/6410635
+                bundle exec rspec

.gitignore

@@ -28,6 +28,10 @@
 # Ignore storage (uploaded files in development and any SQLite databases).
 /storage/*
 !/storage/.keep
+!/storage/seeds/data/locales.json
+!/storage/seeds/data/united_states/congress
+!/storage/seeds/data/united_states/maryland/baltimore
+!/storage/geojson/baltimore-maryland-united_states.geojson
 /tmp/storage/*
 !/tmp/storage/
 !/tmp/storage/.keep

Gemfile.lock

@@ -144,8 +144,6 @@ GEM
       faraday-net_http (>= 2.0, < 3.2)
     faraday-net_http (3.1.0)
       net-http
-    faraday_curl (0.0.2)
-      faraday (>= 0.9.0)
     ffi (1.16.3)
     geocoder (1.8.3)
       base64 (>= 0.1.0)
@@ -520,7 +518,6 @@ DEPENDENCIES
   factory_bot_rails
   faker
   faraday
-  faraday_curl
   geocoder
   google-cloud-storage (~> 1.51)
   hotwire-livereload (~> 1.3)

app/models/sway_locale.rb

@@ -58,7 +58,7 @@ def find_or_create_by_normalized!(**kwargs)
   end
 
   sig { returns(T::Boolean) }
-  def is_congress?
+  def congress?
     city_name == 'congress' && region_name == 'congress'
   end
 

app/models/user.rb

@@ -72,7 +72,7 @@ def sway_locales
 
   sig { returns(T.nilable(SwayLocale)) }
   def default_sway_locale
-    sway_locales.filter { |s| !s.is_congress? }.first || sway_locales.first
+    sway_locales.filter { |s| !s.congress? }.first || sway_locales.first
   end
 
   sig { params(sway_locale: SwayLocale).returns(T::Array[UserLegislator]) }

app/services/congress_legislator_vote_update_service.rb

@@ -11,7 +11,7 @@ def initialize(bill_id)
 
   sig { void }
   def run
-    nil unless @bill.sway_locale.is_congress?
+    nil unless @bill.sway_locale.congress?
 
     senate
     house

lib/sway_geocode.rb

@@ -7,7 +7,7 @@ class << self
 
     sig { params(sway_locale: SwayLocale, address: Address).returns(T.any(Congress, Local)) }
     def build(sway_locale, address)
-       sway_locale.is_congress? ? Congress.new(address) : Local.new(sway_locale, address)
+       sway_locale.congress? ? Congress.new(address) : Local.new(sway_locale, address)
     end
 
     class Congress

spec/models/address_spec.rb

@@ -58,7 +58,7 @@
   end
 
   describe '#sway_locale' do
-    context 'what an address accesses its sway_locale' do
+    context 'when an address accesses its sway_locale' do
       let(:address) do
         Address.new(
           street: Faker::Address.street_address(include_secondary: false),
@@ -70,10 +70,10 @@
 
       it 'returns a SwayLocale, creating it if necessary' do
         start_sway_locale_count = SwayLocale.count
-        sway_locales = address.sway_locales
-        end_sway_locale_count = start_sway_locale_count + 2
+        address.sway_locales
+        end_sway_locale_count = start_sway_locale_count + 2 # local + state, congress is created by seeds
 
-        expect(SwayLocale.count).to equal end_sway_locale_count
+        expect(SwayLocale.count).to eql(end_sway_locale_count)
 
         expect(address.sway_locales.present?).to be_truthy
 

spec/services/congress_legislator_vote_update_service_spec.rb

@@ -14,22 +14,23 @@
         expect(LegislatorVote.count).to eql(0)
 
         address = build(:address, region_code: 'MD')
-        sway_locale = build(
+
+        sway_locale = SwayLocale.default_locale.presence || build(
           :sway_locale,
           CONGRESS
         )
 
         district = build(:district, sway_locale:)
 
-        senator = build(:legislator, address:, district:, title: 'Sen.', external_id: 'V000128', first_name: 'Chris',
-                                     last_name: 'Van Hollen')
-        representative = build(:legislator, address:, district:, first_name: 'Kweisi', last_name: 'Mfume',
-                                            external_id: 'M000687', title: 'Rep.')
+        senator = Legislator.find_by(external_id: 'V000128').presence || build(:legislator, address:, district:, title: 'Sen.', external_id: 'V000128', first_name: 'Chris',
+                                                                                            last_name: 'Van Hollen')
+        representative = Legislator.find_by(external_id: 'M000687').presence || build(:legislator, address:, district:, first_name: 'Kweisi', last_name: 'Mfume',
+                                                                                                   external_id: 'M000687', title: 'Rep.')
 
-        bill = build(:bill, sway_locale:, external_id: 'hr815')
+        bill = Bill.find_by(external_id: 'hr815').presence || create(:bill, sway_locale:, external_id: 'hr815')
         create(:vote, bill:)
 
-        expect(LegislatorVote.count).to eql(2)
+        expect(LegislatorVote.count).to eql(510)
         expect(LegislatorVote.where(legislator: senator).first&.support).to eql('FOR')
         expect(LegislatorVote.where(legislator: representative).first&.support).to eql('FOR')
       end

spec/services/sway_registration_spec.rb

@@ -15,7 +15,7 @@
                                    postal_code: '21202')
         _user_address = create(:user_address, user:, address:)
 
-        address.sway_locales.filter { |s| s.is_congress? || s.has_geojson? }.each do |s|
+        address.sway_locales.filter { |s| s.congress? || s.has_geojson? }.each do |s|
           sway_registration_service = SwayRegistrationService.new(
             user,
             address,
@@ -38,7 +38,7 @@
                                                 postal_code: '21202')
         _invited_user_user_address = create(:user_address, user: invited_user, address: invited_user_address)
 
-        address.sway_locales.filter { |s| s.is_congress? || s.has_geojson? }.each_with_index do |s, i|
+        address.sway_locales.filter { |s| s.congress? || s.has_geojson? }.each_with_index do |s, i|
           allow_any_instance_of(Census::Congress).to receive(:request).and_return(congress_json)
 
           sway_registration_service = SwayRegistrationService.new(

storage/seeds/data/locales.json

@@ -0,0 +1,42 @@
+[
+    {
+        "id": -1,
+        "city": "baltimore",
+        "region": "maryland",
+        "regionCode": "MD",
+        "country": "united_states",
+        "districts": [
+            "MD0",
+            "MD1",
+            "MD2",
+            "MD3",
+            "MD4",
+            "MD5",
+            "MD6",
+            "MD7",
+            "MD8",
+            "MD9",
+            "MD10",
+            "MD11",
+            "MD12",
+            "MD13",
+            "MD14"
+        ],
+        "name": "baltimore-maryland-united_states",
+        "icon_path": "logo.svg",
+        "currentSessionStartDateISO": "2020-12-10",
+        "time_zone": "America/New_York"
+    },
+    {
+        "id": -1,
+        "city": "congress",
+        "region": "congress",
+        "regionCode": "",
+        "country": "united_states",
+        "districts": [],
+        "name": "congress-congress-united_states",
+        "currentSessionStartDateISO": "2021-01-03",
+        "time_zone": "America/New_York",
+        "icon_path": "logo.svg"
+    }
+]