From a157fa3fb3c10ca784073c087ea28b3235fb29b7 Mon Sep 17 00:00:00 2001
From: thiago <thiagitosouza@hotmail.com>
Date: Mon, 1 Dec 2014 17:57:47 -0200
Subject: [PATCH] Fixed test for logout instead login

---
 spec/omniauth/strategies/remote_user_spec.rb | 28 +++++++++++++---------------
 spec/spec_helper.rb                          |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/spec/omniauth/strategies/remote_user_spec.rb b/spec/omniauth/strategies/remote_user_spec.rb
index 0e8e50c..f728d6d 100644
--- a/spec/omniauth/strategies/remote_user_spec.rb
+++ b/spec/omniauth/strategies/remote_user_spec.rb
@@ -23,12 +23,12 @@ describe 'Test Strategy Remote_User' do
 
 	context 'Without REMOTE_USER and logged in' do
 		before(:each){
-			clear_cookies        
+			clear_cookies
 			set_cookie "_gitlab_session=test"
 			set_cookie "_remote_user=test"
 			get '/', {}, {}
 		}
-		
+
 		it 'Logout curreent user' do
 			cookie_session_str = "_gitlab_session=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000" <<
 				"\n_remote_user=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
@@ -45,49 +45,48 @@ describe 'Test Strategy Remote_User' do
 		}
 
 		it 'logs REMOTE_USER in' do
-			expect(last_response.status).to eq(302)			
+			expect(last_response.status).to eq(302)
 			expect(last_response['Set-Cookie']).to eq('_remote_user=foobar')
 		end
 	end
 
 	context 'With REMOTE_USER, logged in and current user equals REMOTE_USER' do
 		before(:each){
-			clear_cookies        
+			clear_cookies
 			set_cookie "_gitlab_session=foobar"
 			set_cookie "_remote_user=foobar"
 			get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
 		}
 
 		it 'Do nothing' do
-			cookie_session_str = "_gitlab_session=foobar\n_remote_user=foobar"
 			expect(last_request.cookies['_gitlab_session']).to eq('foobar')
 			expect(last_request.cookies['_remote_user']).to eq('foobar')
-			expect(last_response.status).to eq(200)			
-			expect(last_response['Set-Cookie']).to eq(nil)	
+			expect(last_response.status).to eq(200)
+			expect(last_response['Set-Cookie']).to eq(nil)
 		end
 	end
 
 	context 'With REMOTE_USER, logged in and current user not equals REMOTE_USER' do
 		before(:each){
-			clear_cookies        
+			clear_cookies
 			set_cookie "_gitlab_session=foobar"
 			set_cookie "_remote_user=foobar"
 			get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar2' }
 		}
 
-		it 'Logout current user and login REMOTE_USER' do
+		it 'Logout current user and login REMOTE_USER and no have _gitlab_session' do
 			expect(last_request.cookies['_gitlab_session']).to eq('foobar')
 			expect(last_request.cookies['_remote_user']).to eq('foobar')
-			expect(last_response.status).to eq(302)			
-			expect(last_response['Set-Cookie']).to eq('_remote_user=foobar2')	
+			expect(last_response.status).to eq(302)
+			expect(last_response['Set-Cookie']).to include('_gitlab_session=')
 		end
 	end
 
 	context 'Verify omniauth hash with REMOTE_USER_DATA' do
 		before(:each){
 			clear_cookies
-			post '/auth/remoteuser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar', 
-									'HTTP_REMOTE_USER_DATA' => JSON.dump({'name' => 'foobar', 'email' => 'foobar@test.com'})}
+			post '/auth/remoteuser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar',
+																							'HTTP_REMOTE_USER_DATA' => JSON.dump({'name' => 'foobar', 'email' => 'foobar@test.com'})}
 		}
 
 		it 'Verify uid' do
@@ -103,7 +102,7 @@ describe 'Test Strategy Remote_User' do
 	context 'Verify omniauth.auth info without REMOTE_USER_DATA' do
 		before(:each){
 			clear_cookies
-			post '/auth/remoteuser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar' } 
+			post '/auth/remoteuser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
 		}
 
 		it 'Verify uid' do
@@ -115,4 +114,3 @@ describe 'Test Strategy Remote_User' do
 		end
 	end
 end
-
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2f86151..68ae65c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -18,7 +18,7 @@ require 'omniauth/test'
 Bundler.setup :default, :development, :test
 
 require 'rack/test'
-require 'omniauth/remote_user'
+require 'omniauth/remote-user'
 
 RSpec.configure do |config|
 	config.include Rack::Test::Methods
--
libgit2 0.21.2