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

[rails.git] / test / controllers / site_controller_test.rb

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index 77b07db7d53c9cc281113aa642f8fb01845235f9..2d47e7de70a650fa8f0e74846c1e7317d0a95696 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -1,22 +1,6 @@
 require "test_helper"
 
 class SiteControllerTest < ActionDispatch::IntegrationTest
 require "test_helper"
 
 class SiteControllerTest < ActionDispatch::IntegrationTest

-  ##
-  # setup oauth keys
-  def setup
-    super
-
-    Settings.id_key = create(:client_application).key
-    Settings.potlatch2_key = create(:client_application).key
-  end
-
-  ##
-  # clear oauth keys
-  def teardown
-    Settings.id_key = nil
-    Settings.potlatch2_key = nil
-  end
-

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


@@ -180,7 +164,7 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
     get edit_path
 
     assert_response :redirect
     get edit_path
 
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :referer => "/edit"
+    assert_redirected_to login_path(:referer => "/edit")

   end
 
   # Test the error when trying to edit without public edits
   end
 
   # Test the error when trying to edit without public edits


@@ -275,8 +259,8 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_template "edit"
 
     assert_response :success
     assert_template "edit"

-    assert_equal 1.0, assigns(:lat)
-    assert_equal 1.0, assigns(:lon)
+    assert_in_delta(1.0, assigns(:lat))
+    assert_in_delta(1.0, assigns(:lon))

     assert_equal 18, assigns(:zoom)
   end
 
     assert_equal 18, assigns(:zoom)
   end
 


@@ -312,8 +296,8 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
     get edit_path(:way => way.id)
     assert_response :success
     assert_template "edit"
     get edit_path(:way => way.id)
     assert_response :success
     assert_template "edit"

-    assert_equal 3.0, assigns(:lat)
-    assert_equal 3.0, assigns(:lon)
+    assert_in_delta(3.0, assigns(:lat))
+    assert_in_delta(3.0, assigns(:lon))

     assert_equal 17, assigns(:zoom)
   end
 
     assert_equal 17, assigns(:zoom)
   end
 


@@ -349,8 +333,8 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
     get edit_path(:note => note.id)
     assert_response :success
     assert_template "edit"
     get edit_path(:note => note.id)
     assert_response :success
     assert_template "edit"

-    assert_equal 1.0, assigns(:lat)
-    assert_equal 1.0, assigns(:lon)
+    assert_in_delta(1.0, assigns(:lat))
+    assert_in_delta(1.0, assigns(:lon))

     assert_equal 17, assigns(:zoom)
   end
 
     assert_equal 17, assigns(:zoom)
   end
 


@@ -386,8 +370,8 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
     get edit_path(:gpx => gpx.id)
     assert_response :success
     assert_template "edit"
     get edit_path(:gpx => gpx.id)
     assert_response :success
     assert_template "edit"

-    assert_equal 1.0, assigns(:lat)
-    assert_equal 1.0, assigns(:lon)
+    assert_in_delta(1.0, assigns(:lat))
+    assert_in_delta(1.0, assigns(:lon))

     assert_equal 16, assigns(:zoom)
   end
 
     assert_equal 16, assigns(:zoom)
   end
 


@@ -454,7 +438,7 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
   def test_welcome
     get welcome_path
     assert_response :redirect
   def test_welcome
     get welcome_path
     assert_response :redirect

-    assert_redirected_to :controller => :users, :action => :login, :referer => "/welcome"
+    assert_redirected_to login_path(:referer => "/welcome")

 
     session_for(create(:user))
     get welcome_path
 
     session_for(create(:user))
     get welcome_path