From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Aug 2023 18:25:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4182'
X-Git-Tag: live~672
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b45642d2abca834c59e7db1fda512151393c88cc?hp=270b0d575e63b1beabb89fb33c58db57f9f69089

Merge remote-tracking branch 'upstream/pull/4182'
---

diff --git a/app/views/api/versions/show.json.jbuilder b/app/views/api/versions/show.json.jbuilder
new file mode 100644
index 000000000..7336902bd
--- /dev/null
+++ b/app/views/api/versions/show.json.jbuilder
@@ -0,0 +1,5 @@
+json.partial! "api/root_attributes"
+
+json.api do
+  json.versions @versions
+end
diff --git a/test/controllers/api/versions_controller_test.rb b/test/controllers/api/versions_controller_test.rb
index a1a616ad1..1c70831c9 100644
--- a/test/controllers/api/versions_controller_test.rb
+++ b/test/controllers/api/versions_controller_test.rb
@@ -9,10 +9,18 @@ module Api
         { :path => "/api/versions", :method => :get },
         { :controller => "api/versions", :action => "show" }
       )
+      assert_routing(
+        { :path => "/api/versions.json", :method => :get },
+        { :controller => "api/versions", :action => "show", :format => "json" }
+      )
       assert_recognizes(
         { :controller => "api/versions", :action => "show" },
         { :path => "/api/versions", :method => :get }
       )
+      assert_recognizes(
+        { :controller => "api/versions", :action => "show", :format => "json" },
+        { :path => "/api/versions.json", :method => :get }
+      )
     end
 
     def test_versions
@@ -25,6 +33,14 @@ module Api
       end
     end
 
+    def test_versions_json
+      get api_versions_path, :params => { :format => "json" }
+      assert_response :success
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal [Settings.api_version], js["api"]["versions"]
+    end
+
     def test_no_version_in_root_element
       get api_versions_path
       assert_response :success