CV2-6599: fix omniauth tests

Author: melsawy

app/controllers/api/v1/omniauth_callbacks_controller.rb

@@ -20,7 +20,6 @@ def failure
       end
 
       def setup
-        setup_twitter if request.env['omniauth.strategy'].is_a?(OmniAuth::Strategies::Twitter)
         setup_facebook if request.env['omniauth.strategy'].is_a?(OmniAuth::Strategies::Facebook)
         render plain: 'Setup complete.', status: 404
       end

lib/sample_data.rb

@@ -169,6 +169,7 @@ def create_omniauth_user(options = {})
     provider = options.has_key?(:provider) ? options[:provider] : %w(google slack).sample
     auth[:uid] = options.has_key?(:uid) ? options[:uid] : random_string
     auth[:url] = url
+    options[:info][:email] = options[:email] if options.has_key?(:info) && options[:info][:email].nil?
     auth[:info] = options.has_key?(:info) ? options[:info] : {name: random_string, email: options[:email]}
     auth[:credentials] = options.has_key?(:credentials) ? options[:credentials] : {token: random_string, secret: random_string}
     auth[:extra] = options.has_key?(:extra) ? options[:extra] : {}

test/controllers/base_api_controller_test.rb

@@ -41,23 +41,23 @@ def setup
   end
 
   test "should get current user from session" do
-    u = create_omniauth_user info: {name: 'Test User'}
+    u = create_omniauth_user email: '[email protected]', info: {name: 'Test User'}
     authenticate_with_user(u)
     get :me, params: {}
     assert_response :success
     response = JSON.parse(@response.body)
-    assert_equal 'Test User', response['data']['name']
+    assert_equal '[email protected]', response['data']['email']
     assert_equal 'session', response['data']['source']
   end
 
   test "should get current user from token" do
-    u = create_omniauth_user info: {name: 'Test User'}
+    u = create_omniauth_user email: '[email protected]', info: { name: 'Test User', email: '[email protected]' }
     header = CheckConfig.get('authorization_header') || 'X-Token'
     @request.headers.merge!({ header => u.token })
     get :me, params: {}
     assert_response :success
     response = JSON.parse(@response.body)
-    assert_equal 'Test User', response['data']['name']
+    assert_equal '[email protected]', response['data']['email']
     assert_equal 'token', response['data']['source']
   end
 

test/controllers/omniauth_callbacks_controller_test.rb

@@ -5,19 +5,6 @@ def setup
     super
     @controller = Api::V1::OmniauthCallbacksController.new
     OmniAuth.config.test_mode = true
-    OmniAuth.config.mock_auth[:twitter] = OmniAuth::AuthHash.new({
-      provider: 'twitter',
-      uid: '654321',
-      info: {
-        name: 'Test',
-        image: 'http://twitter.com/test/image.png',
-        nickname: 'test'
-      },
-      credentials: {
-        token: '123456',
-        secret: 'top_secret'
-      }
-    })
     OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new({
       provider: 'facebook',
       uid: '654321',
@@ -77,8 +64,11 @@ def setup
         secret: 'top_secret'
       }
     })
+    [{email: '[email protected]', name: 'Test'}, {email: '[email protected]', name: 'Mohamed El-Sawy'}].each do |info|
+      invite_new_user info
+    end
     request.env['devise.mapping'] = Devise.mappings[:api_user]
-    ['https://twitter.com/test', 'https://facebook.com/654321', 'https://www.googleapis.com/plus/v1/people/654321'].each do |url|
+    ['https://facebook.com/654321', 'https://www.googleapis.com/plus/v1/people/654321'].each do |url|
       WebMock.stub_request(:get, CheckConfig.get('pender_url_private') + '/api/medias').with({ query: { url: url } }).to_return(body: '{"type":"media","data":{"type":"profile"}}')
     end
     User.current = nil
@@ -89,25 +79,6 @@ def teardown
     User.current = nil
   end
 
-  test "should redirect to root after Twitter authentication" do
-    request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:twitter]
-    get :twitter, params: {}
-    assert_redirected_to '/close.html'
-  end
-
-  test "should set information in session after Twitter authentication" do
-    request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:twitter]
-    assert_nil session['checkdesk.user']
-    get :twitter, params: {}
-    assert_not_nil session['checkdesk.current_user_id']
-  end
-
-  test "should redirect to destination after Twitter authentication" do
-    request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:twitter]
-    get :twitter, params: { destination: '/close.html' }
-    assert_redirected_to '/close.html'
-  end
-
   test "should set information in session after Facebook authentication" do
     request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:facebook]
     assert_nil session['checkdesk.user']
@@ -190,12 +161,11 @@ def teardown
   end
 
   test "should connect when current user set" do
-    p1 = random_complex_password
-    u = create_user login: 'test', password: p1, password_confirmation: p1, email: '[email protected]'
+    u = User.where(email: '[email protected]').first
     u.confirm
     authenticate_with_user(u)
-    request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:twitter]
-    get :twitter, params: {}
+    request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:facebook]
+    get :facebook, params: {}
     u = User.find(u.id)
     assert_equal 1, u.source.accounts.count
   end
@@ -219,12 +189,6 @@ def teardown
     assert_redirected_to '/close.html'
   end
 
-  test "should setup Twitter authentication" do
-    request.env['omniauth.strategy'] = OmniAuth::Strategies::Twitter.new({})
-    get :setup, params: {}
-    assert_response 404
-  end
-
   test "should setup Facebook authentication" do
     request.env['omniauth.strategy'] = OmniAuth::Strategies::Facebook.new({})
     get :setup, params: {}