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

[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 f7f51403539ba5a9969163c184ebf2590317fba9..a1a616ad19db026960016c8acaeda53b856589b2 100644 (file)
--- a/test/controllers/api/versions_controller_test.rb
+++ b/test/controllers/api/versions_controller_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 module Api
 require "test_helper"
 
 module Api

-  class VersionsControllerTest < ActionController::TestCase
+  class VersionsControllerTest < ActionDispatch::IntegrationTest

     ##
     # test all routes which lead to this controller
     def test_routes
     ##
     # test all routes which lead to this controller
     def test_routes


@@ -16,7 +16,7 @@ module Api
     end
 
     def test_versions
     end
 
     def test_versions

-      get :show
+      get api_versions_path

       assert_response :success
       assert_select "osm[generator='#{Settings.generator}']", :count => 1 do
         assert_select "api", :count => 1 do
       assert_response :success
       assert_select "osm[generator='#{Settings.generator}']", :count => 1 do
         assert_select "api", :count => 1 do


@@ -26,7 +26,7 @@ module Api
     end
 
     def test_no_version_in_root_element
     end
 
     def test_no_version_in_root_element

-      get :show
+      get api_versions_path

       assert_response :success
       assert_select "osm[version]", :count => 0
     end
       assert_response :success
       assert_select "osm[version]", :count => 0
     end