gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #555 from differentreality/mock_credentials

Browse source 
add username for mock credentials of openid in development
This commit is contained in:
Henne Vogelsang 2014-12-05 16:24:10 +01:00
commit a52918c273
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/user.rb
View file

@ -106,6 +106,7 @@ class User < ActiveRecord::Base
if user.new_record? if user.new_record?
user.email = auth.info.email user.email = auth.info.email
user.name = auth.info.name user.name = auth.info.name
user.username = auth.info.username
user.password = Devise.friendly_token[0, 20] user.password = Devise.friendly_token[0, 20]
user.skip_confirmation! user.skip_confirmation!
end end

9
config/environments/development.rb
View file

@ -46,7 +46,8 @@ Osem::Application.configure do
uid: 'facebook-test-uid-1', uid: 'facebook-test-uid-1',
info: { info: {
name: 'admin admin', name: 'admin admin',
email: 'admin@email.com' email: 'admin@email.com',
username: 'admin_admin'
}, },
credentials: { credentials: {
token: 'fb_mock_token', token: 'fb_mock_token',
@ -60,7 +61,8 @@ Osem::Application.configure do
uid: 'google-test-uid-1', uid: 'google-test-uid-1',
info: { info: {
name: 'simple user', name: 'simple user',
email: 'user0@email.com' email: 'user0@email.com',
username: 'simple_user0'
}, },
credentials: { credentials: {
token: 'google_mock_token', token: 'google_mock_token',
@ -74,7 +76,8 @@ Osem::Application.configure do
uid: 'suse-test-uid-1', uid: 'suse-test-uid-1',
info: { info: {
name: 'another user', name: 'another user',
email: 'user1@email.com' email: 'user1@email.com',
username: 'another_user'
}, },
credentials: { credentials: {
token: 'suse_mock_token', token: 'suse_mock_token',