From febcb9c939028a8f7e7f122c051db9f55842e45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9A=D0=BE?=
=?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B5=D0=BD=D0=BE=D0=BA?=
<dmitry.kovalenok@twinslash.com>
Date: Thu, 1 Nov 2012 14:13:15 +0300
Subject: [PATCH] updating Gemfile.lock
---
Gemfile | 6 +----
Gemfile.lock | 14 ++++++++++++
.../redmine_oauth_controller_test.rb | 22 +++++++++++++------
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/Gemfile b/Gemfile
index d8652ae..07aca09 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 83f331d..c423474 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 82c4e47..96b1bec 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
--
GitLab