From: Tom Hughes <tom@compton.nu>
Date: Mon, 8 Jun 2015 15:27:04 +0000 (+0100)
Subject: Remove bogus mock data from facebook and windowslive tests
X-Git-Tag: live~4089
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e07890a2adcee77c3244d5d04f52787968ebca75?ds=sidebyside

Remove bogus mock data from facebook and windowslive tests
---

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 940eb3044..1ff8f9a65 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -385,9 +385,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_facebook_success
-    OmniAuth.config.add_mock(:facebook, :uid => "123454321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
-                             })
+    OmniAuth.config.add_mock(:facebook, :uid => "123454321")
 
     new_email = "newtester-facebook@osm.org"
     display_name = "new_tester-facebook"
@@ -447,9 +445,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_facebook_redirect
-    OmniAuth.config.add_mock(:facebook, :uid => "123454321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
-                             })
+    OmniAuth.config.add_mock(:facebook, :uid => "123454321")
 
     new_email = "redirect_tester_facebook@osm.org"
     display_name = "redirect_tester_facebook"
@@ -502,9 +498,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_windowslive_success
-    OmniAuth.config.add_mock(:windowslive, :uid => "123454321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
-                             })
+    OmniAuth.config.add_mock(:windowslive, :uid => "123454321")
 
     new_email = "newtester-windowslive@osm.org"
     display_name = "new_tester-windowslive"
@@ -564,9 +558,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_windowslive_redirect
-    OmniAuth.config.add_mock(:windowslive, :uid => "123454321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
-                             })
+    OmniAuth.config.add_mock(:windowslive, :uid => "123454321")
 
     new_email = "redirect_tester_windowslive@osm.org"
     display_name = "redirect_tester_windowslive"
diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index ae1c3cfd6..a48933cf4 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -972,9 +972,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   end
 
   def test_login_facebook_success
-    OmniAuth.config.add_mock(:facebook, :uid => "123456789", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
-                             })
+    OmniAuth.config.add_mock(:facebook, :uid => "123456789")
 
     get "/login", :referer => "/history"
     assert_response :redirect
@@ -1042,9 +1040,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   end
 
   def test_login_facebook_unknown
-    OmniAuth.config.add_mock(:facebook, :uid => "987654321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
-                             })
+    OmniAuth.config.add_mock(:facebook, :uid => "987654321")
 
     get "/login", :referer => "/history"
     assert_response :redirect
@@ -1064,9 +1060,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   end
 
   def test_login_windowslive_success
-    OmniAuth.config.add_mock(:windowslive, :uid => "123456789", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
-                             })
+    OmniAuth.config.add_mock(:windowslive, :uid => "123456789")
 
     get "/login", :referer => "/history"
     assert_response :redirect
@@ -1134,9 +1128,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   end
 
   def test_login_windowslive_unknown
-    OmniAuth.config.add_mock(:windowslive, :uid => "987654321", :extra => {
-                               :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
-                             })
+    OmniAuth.config.add_mock(:windowslive, :uid => "987654321")
 
     get "/login", :referer => "/history"
     assert_response :redirect