Move $worldwide_api global variable to Services module method

app/models/world_location.rb

@@ -13,15 +13,15 @@ def self.reset_cache
 
   def self.all
     cache_fetch("all") do
-      $worldwide_api.world_locations.with_subsequent_pages.map do |l|
+      Services.worldwide_api.world_locations.with_subsequent_pages.map do |l|
         new(l) if l.format == "World location" and l.details and l.details.slug.present?
       end.compact
     end
   end
 
   def self.find(location_slug)
     cache_fetch("find_#{location_slug}") do
-      data = $worldwide_api.world_location(location_slug)
+      data = Services.worldwide_api.world_location(location_slug)
       self.new(data) if data
     end
   end

app/models/worldwide_organisation.rb

@@ -2,7 +2,7 @@ class WorldwideOrganisation
   extend Forwardable
 
   def self.for_location(location_slug)
-    $worldwide_api.organisations_for_world_location(location_slug).map do |org|
+    Services.worldwide_api.organisations_for_world_location(location_slug).map do |org|
       new(org)
     end
   end

lib/services.rb

@@ -1,5 +1,6 @@
 require 'gds_api/publishing_api'
 require 'gds_api/imminence'
+require 'gds_api/worldwide'
 
 module Services
   def self.publishing_api
@@ -9,4 +10,14 @@ def self.publishing_api
   def self.imminence_api
     @imminence_api ||= GdsApi::Imminence.new(Plek.new.find('imminence'))
   end
+
+  def self.worldwide_api
+    # In development, point at the public version of the API
+    # as we won't normally have whitehall running
+    if Rails.env.development?
+      @worldwide_api ||= GdsApi::Worldwide.new("https://www.gov.uk")
+    else
+      @worldwide_api ||= GdsApi::Worldwide.new(Plek.new.find('whitehall-admin'))
+    end
+  end
 end

test/unit/world_location_test.rb

@@ -40,7 +40,7 @@ class WorldLocationTest < ActiveSupport::TestCase
       details = {"results" => [loc1, loc2, loc3, loc4]}
       response = GdsApi::ListResponse.new(stub(body: details.to_json, headers: {}), nil)
 
-      $worldwide_api.stubs(:world_locations).returns(response)
+      Services.worldwide_api.stubs(:world_locations).returns(response)
 
       results = WorldLocation.all
       assert_equal %w(location-1 location-4), results.map(&:slug)