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

[rails.git] / test / controllers / api / versions_controller_test.rb

diff --git a/test/controllers/api/versions_controller_test.rb b/test/controllers/api/versions_controller_test.rb
index a1a616ad19db026960016c8acaeda53b856589b2..1c70831c93c9b65293cb107ac1f04b059f4fd90c 100644 (file)
--- 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" }
       )
         { :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" },
         { :path => "/api/versions", :method => :get }
       )

+      assert_recognizes(
+        { :controller => "api/versions", :action => "show", :format => "json" },
+        { :path => "/api/versions.json", :method => :get }
+      )

     end
 
     def test_versions
     end
 
     def test_versions


@@ -25,6 +33,14 @@ module Api
       end
     end
 
       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
     def test_no_version_in_root_element
       get api_versions_path
       assert_response :success