social networks controller refactoring

app/controllers/web/social_network_controller.rb → app/controllers/web/social_networks_controller.rb

@@ -1,4 +1,4 @@
-class Web::SocialNetworkController < Web::ApplicationController
+class Web::SocialNetworksController < Web::ApplicationController
 
   def authorization
     authorization = Authorization.find_by_provider_and_uid(auth_hash[:provider], auth_hash[:uid])

app/helpers/web/social_networks_helper.rb

@@ -0,0 +1,2 @@
+module Web::SocialNetworksHelper
+end

config/routes.rb

@@ -8,8 +8,8 @@
   mount Ckeditor::Engine => '/ckeditor'
 
   # omniauth-facebook
-  get '/auth/facebook/callback' => 'web/social_network#authorization'
-  get '/auth/facebook/failure' => 'web/social_network#failure'
+  get '/auth/facebook/callback' => 'web/social_networks#authorization'
+  get '/auth/facebook/failure' => 'web/social_networks#failure'
 
   namespace :api do
     resources :companies
@@ -34,7 +34,7 @@
       end
     end
 
-    resource :social_network, :only => [] do 
+    resource :social_networks, :only => [] do 
       get :authorization, :on => :member
     end
 

test/functional/web/social_network_controller_test.rb → test/functional/web/social_networks_controller_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Web::SocialNetworkControllerTest < ActionController::TestCase
+class Web::SocialNetworksControllerTest < ActionController::TestCase
 
   setup do
     @auth_hash = generate(:facebook_auth_hash)
@@ -15,9 +15,9 @@ class Web::SocialNetworkControllerTest < ActionController::TestCase
     request.env['omniauth.auth'] = @auth_hash
     get :authorization
 
+    assert_response :redirect
     assert signed_in?
     assert_equal current_user, @user
-    assert_response :redirect
   end
 
   test "should get authorization with facebook on existing user" do
@@ -27,19 +27,19 @@ class Web::SocialNetworkControllerTest < ActionController::TestCase
     request.env['omniauth.auth'] = @auth_hash
     get :authorization
 
+    assert_response :redirect
     @user.reload
     assert @user.active?
     assert signed_in?
-    assert current_user.authorizations
-    assert_response :redirect
+    assert !current_user.authorizations.blank?
   end
 
   test "should get authorization with facebook on new user" do
     request.env['omniauth.auth'] = @auth_hash
     get :authorization
 
-    assert session_auth_hash
     assert_response :redirect
+    assert session_auth_hash
   end
 
   test "should get failure" do

test/unit/helpers/web/social_networks_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class Web::SocialNetworksHelperTest < ActionView::TestCase
+end