diff --git a/Gemfile b/Gemfile index d8652ae1b90387fdbd1bdcbd2ef2a0f68499ff7b..07aca092b136cb4be58dd7f67e98f253c0346d89 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,2 @@ gem 'oauth2' -gem 'json' - -group :development, :test do - gem 'pry' -end \ No newline at end of file +gem 'json' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 83f331dafcd33673ac161833d3da7ce5f4b8b610..c423474c2a7d3f718a78aad6f2ffb9255cbf495c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,21 @@ GEM specs: + addressable (2.3.2) + faraday (0.7.6) + addressable (~> 2.2) + multipart-post (~> 1.1) + rack (~> 1.1) + json (1.7.5) + multi_json (1.3.6) + multipart-post (1.1.5) + oauth2 (0.5.2) + faraday (~> 0.7) + multi_json (~> 1.0) + rack (1.4.1) PLATFORMS ruby DEPENDENCIES + json + oauth2 diff --git a/test/functional/redmine_oauth_controller_test.rb b/test/functional/redmine_oauth_controller_test.rb index 82c4e4767d867adcec2274b03bb8bc01bb4c3afa..96b1bec928c0d0cee0c115587986f5faddc7ef1f 100644 --- a/test/functional/redmine_oauth_controller_test.rb +++ b/test/functional/redmine_oauth_controller_test.rb @@ -11,19 +11,27 @@ class RedmineOauthControllerTest < ActionController::TestCase OAuth2::Response.any_instance.stubs(body: body.to_json) end - def test_login_with_omniauth_for_new_user - Setting.self_registration = '3' + def new_user options = nil user_credentials = {:firstname => 'Cool', :lastname => 'User', - :mail => 'user@somedomain.com'} - User.where(user_credentials).delete_all - new_user = User.new(user_credentials) - new_user.login = 'cool_user' - + :mail => 'user@somedomain.com'}.merge(options) + user = User.new(user_credentials) + user.login = options[:login] || 'cool_user' + user + end + + def test_login_with_omniauth_for_new_user + Setting.self_registration = '3' + user set_response_body_stub({verified_email: "true", name: [new_user.firstname, new_user.lastname]*" ", given_name: new_user.firstname, family_name: new_user.lastname, email: new_user.mail}) get :oauth_google_callback, :email => new_user.mail assert_redirected_to controller: 'my', action: 'account' end + def test_login_with_invalid_oauth_provider + Setting.self_registration = '0' + + end + #assert existing_user.save! end \ No newline at end of file