Merge pull request #980 from alphagov/switch-the-worldwide-api-endpoint

Switch the Worldwide API endpoint

CHANGELOG.md

@@ -1,3 +1,9 @@
+# Unreleased
+
+* Change Worldwide API requests to be routed to whitehall-frontend by
+  default, rather than whitehall-admin. Update the test helpers
+  accordingly.
+
 # 63.2.0
 
 * Issue a warning when deprecated stub methods are called. `stub_*` methods

lib/gds_api.rb

@@ -117,8 +117,9 @@ def self.maslow(options = {})
     GdsApi::Maslow.new(Plek.new.external_url_for("maslow"), options)
   end
 
-  # Creates a GdsApi::Organisations adapter for accessing Whitehall APIs on a
-  # whitehall-admin host
+  # Creates a GdsApi::Organisations adapter for accessing Whitehall
+  # APIs through the origin, where the requests will be handled by
+  # Collections frontend.
   #
   # @return [GdsApi::Organisations]
   def self.organisations(options = {})
@@ -192,10 +193,10 @@ def self.support_api(options = {})
   end
 
   # Creates a GdsApi::Worldwide adapter for accessing Whitehall APIs on a
-  # whitehall-admin host
+  # whitehall-frontend host
   #
   # @return [GdsApi::Worldwide]
   def self.worldwide(options = {})
-    GdsApi::Worldwide.new(Plek.find("whitehall-admin"), options)
+    GdsApi::Worldwide.new(Plek.find("whitehall-frontend"), options)
   end
 end

lib/gds_api/test_helpers/worldwide.rb

@@ -8,7 +8,7 @@ module Worldwide
       extend AliasDeprecated
       include GdsApi::TestHelpers::CommonResponses
 
-      WORLDWIDE_API_ENDPOINT = Plek.current.find("whitehall-admin")
+      WORLDWIDE_API_ENDPOINT = Plek.current.find("whitehall-frontend")
 
       # Sets up the index endpoints for the given country slugs
       # The stubs are setup to paginate in chunks of 20