Geocoder implemeted in tests, revert of changes in schema and other minor requested changes

Author: someykoku

app/models/donation_site.rb

@@ -22,8 +22,7 @@ class DonationSite < ApplicationRecord
 
   belongs_to :organization
 
-  validates :name, presence: true
-  validates :address, presence: true
+  validates :name, :address, presence: true
   validates :name, uniqueness: {scope: :organization_id, message: "must be unique within the organization"}
   validates :contact_name, length: {minimum: 3}, allow_blank: true
   validates :email, format: {with: URI::MailTo::EMAIL_REGEXP, message: "is not a valid email format"}, allow_blank: true

db/schema.rb

@@ -231,21 +231,6 @@
     t.index ["user_id"], name: "index_deprecated_feedback_messages_on_user_id"
   end
 
-  create_table "diaper_drive_participants", id: :serial, force: :cascade do |t|
-    t.string "contact_name"
-    t.string "email"
-    t.string "phone"
-    t.string "comment"
-    t.integer "organization_id"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.string "address"
-    t.string "business_name"
-    t.float "latitude"
-    t.float "longitude"
-    t.index ["latitude", "longitude"], name: "index_diaper_drive_participants_on_latitude_and_longitude"
-  end
-
   create_table "distributions", id: :serial, force: :cascade do |t|
     t.text "comment"
     t.datetime "created_at", precision: nil, null: false
@@ -341,16 +326,6 @@
     t.index ["partner_id"], name: "index_families_on_partner_id"
   end
 
-  create_table "feedback_messages", force: :cascade do |t|
-    t.bigint "user_id"
-    t.string "message"
-    t.string "path"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.boolean "resolved"
-    t.index ["user_id"], name: "index_feedback_messages_on_user_id"
-  end
-
   create_table "flipper_features", force: :cascade do |t|
     t.string "key", null: false
     t.datetime "created_at", precision: nil, null: false

spec/models/donation_site_spec.rb

@@ -16,25 +16,29 @@
 #  organization_id :integer
 #
 
-require "rails_helper"
-
 RSpec.describe DonationSite, type: :model do
   context "Validations >" do
     it { should belong_to(:organization) }
     it { should validate_presence_of(:name) }
     it { should validate_presence_of(:address) }
   end
 
+  before(:each) do
+    Geocoder.configure(lookup: :test)
+
+    Geocoder::Lookup::Test.add_stub(
+      "456 Donation Site Blvd", [
+        {"latitude" => 38.8977, "longitude" => -77.0365, "address" => "456 Donation Site Blvd"}
+      ]
+    )
+  end
+
   describe "import_csv" do
     let(:organization) { create(:organization) }
     let(:valid_csv_path) { Rails.root.join("spec", "fixtures", "files", "valid_donation_sites.csv") }
     let(:invalid_csv_path) { Rails.root.join("spec", "fixtures", "files", "invalid_donation_sites.csv") }
     let(:duplicated_name_csv_path) { Rails.root.join("spec", "fixtures", "files", "duplicated_name_donation_sites.csv") }
 
-    before do
-      allow_any_instance_of(DonationSite).to receive(:geocode).and_return([40.7128, -74.0060])
-    end
-
     it "captures the error if the name is not unique in the invalid donation sites csv" do
       data = File.read(duplicated_name_csv_path, encoding: "BOM|UTF-8")
       csv = CSV.parse(data, headers: true)