Refactor fixture-selecting logic (for clarity).

test/test_helper.rb

@@ -88,6 +88,9 @@ module Geocoder
         s
       end
 
+      ##
+      # Fixture to use if none match the given query.
+      #
       def default_fixture_filename
         "#{fixture_prefix}_madison_square_garden"
       end
@@ -96,20 +99,16 @@ module Geocoder
         handle
       end
 
+      def fixture_for_query(query)
+        label = query.reverse_geocode? ? "reverse" : query.text.gsub(/[ \.]/, "_")
+        filename = "#{fixture_prefix}_#{label}"
+        fixture_exists?(filename) ? filename : default_fixture_filename
+      end
+
       def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
-        if query.reverse_geocode?
-          filename = "#{fixture_prefix}_reverse"
-        else
-          label = query.text.gsub(/[ \.]/, "_")
-          filename = "#{fixture_prefix}_#{label}"
-        end
-        if fixture_exists?(filename)
-          read_fixture "#{filename}"
-        else
-          read_fixture default_fixture_filename
-        end
+        read_fixture fixture_for_query(query)
       end
     end