View other nearby Locations


      app/models/location.rb

diff --git a/app/models/location.rb b/app/models/location.rb
index 150ad93..23c501f 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -7,6 +7,10 @@ class Location < ApplicationRecord
 
   delegate :name, to: :locatable
 
+  def nearby(*arguments)
+    Location.near(self, *arguments).where.not(id: self)
+  end
+
   def address
     [ line1, city, state, postal_code, country ].join(", ")
   end


      app/views/locations/show.html.erb

diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb
index 9ef9f04..ab6f8a1 100644
--- a/app/views/locations/show.html.erb
+++ b/app/views/locations/show.html.erb
@@ -29,5 +29,16 @@
 
     <dt>Tags</dt>
     <dd><%= location.locatable_name.titleize %></dd>
+
+    <% location.nearby(1, unit: :mi).tap do |nearby_locations| %>
+      <% if nearby_locations.any? %>
+        <dt>Nearby<dt>
+        <dd>
+          <ul>
+            <%= render layout: "li", partial: nearby_locations %>
+          </ul>
+        </dd>
+      <% end %>
+    <% end %>
   </dl>
 </section>


      test/controllers/locations_controller_test.rb

diff --git a/test/controllers/locations_controller_test.rb b/test/controllers/locations_controller_test.rb
index 90865aa..300ec6b 100644
--- a/test/controllers/locations_controller_test.rb
+++ b/test/controllers/locations_controller_test.rb
@@ -1,10 +1,15 @@
 require "test_helper"
 
 class LocationsControllerTest < ActionDispatch::IntegrationTest
+  include ActionView::Helpers::TextHelper
+
   test "#index includes the number of results" do
+    thoughtbot_nyc = offices(:thoughtbot_nyc)
+    nearby_locations = thoughtbot_nyc.nearby(1, unit: :mi)
+
     get root_path
 
-    assert_text /\d+ results/
+    assert_text pluralize(nearby_locations.size + 1, "result")
   end
 
   test "#index includes information about the Locations' creators" do
@@ -38,4 +43,23 @@ class LocationsControllerTest < ActionDispatch::IntegrationTest
     assert_text thoughtbot_nyc.name
     assert_text thoughtbot_nyc.creator.name
   end
+
+  test "#show renders other nearby Locations" do
+    thoughtbot_nyc = offices(:thoughtbot_nyc)
+    culture_espresso = cafes(:culture_espresso)
+    staten_island_mall = attractions(:staten_island_mall)
+
+    get location_path(thoughtbot_nyc.location)
+
+    assert_text culture_espresso.name
+    assert_no_text staten_island_mall.name
+  end
+
+  test "#hides the nearby header when there are no nearby Locations" do
+    staten_island_mall = attractions(:staten_island_mall)
+
+    get location_path(staten_island_mall.location)
+
+    assert_select "dt", count: 0, text: "Nearby"
+  end
 end


      test/models/location_test.rb

diff --git a/test/models/location_test.rb b/test/models/location_test.rb
index a1fbbcd..cfb1858 100644
--- a/test/models/location_test.rb
+++ b/test/models/location_test.rb
@@ -17,4 +17,34 @@ class LocationTest < ActiveSupport::TestCase
     assert_equal thoughtbot_nyc.latitude, latitude
     assert_equal thoughtbot_nyc.longitude, longitude
   end
+
+  test "#nearby excludes the Location" do
+    thoughtbot_nyc = offices(:thoughtbot_nyc)
+
+    nearby = thoughtbot_nyc.nearby
+
+    assert_not_includes nearby, thoughtbot_nyc.location
+  end
+
+  test "#nearby returns other Locations" do
+    thoughtbot_nyc = offices(:thoughtbot_nyc)
+    culture_espresso = cafes(:culture_espresso)
+    staten_island_mall = attractions(:staten_island_mall)
+
+    nearby = thoughtbot_nyc.nearby
+
+    assert_includes nearby, culture_espresso.location
+    assert_includes nearby, staten_island_mall.location
+  end
+
+  test "#nearby accepts a range and unit for filtering" do
+    thoughtbot_nyc = offices(:thoughtbot_nyc)
+    culture_espresso = cafes(:culture_espresso)
+    staten_island_mall = attractions(:staten_island_mall)
+
+    nearby = thoughtbot_nyc.nearby(1, unit: :mi)
+
+    assert_includes nearby, culture_espresso.location
+    assert_not_includes nearby, staten_island_mall.location
+  end
 end


      test/test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 6b37d4a..1ea5f98 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -14,12 +14,10 @@ end
 
 class ActionDispatch::IntegrationTest
   def assert_text(text)
-    matching =
-      case text
-      when Regexp then text
-      else /#{text.squish}/
-      end
+    assert_includes document_root_element.text.squish, text.squish
+  end
 
-    assert_match matching, document_root_element.text.squish
+  def assert_no_text(text)
+    assert_not_includes document_root_element.text.squish, text.squish
   end
 end