User/Person models merge

This commit is contained in:
Stella Rouzi 2014-06-23 19:07:50 +03:00
parent 66b84e3660
commit 23bf55b66c
80 changed files with 1064 additions and 1221 deletions

View file

@ -13,6 +13,7 @@ module OmniauthMacros
provider: 'google',
uid: 'google-test-uid-1',
info: {
name: 'new user name',
email: 'test-1@gmail.com'
},
credentials: {
@ -28,6 +29,7 @@ module OmniauthMacros
provider: 'google',
uid: 'facebook-test-uid-1',
info: {
name: 'new user fb name',
email: 'test-1@gmail.com'
},
credentials: {
@ -45,6 +47,7 @@ module OmniauthMacros
provider: 'google',
uid: 'google-test-uid-participant-1',
info: {
name: 'existing user participant name',
email: 'test-participant-1@google.com'
},
credentials: {
@ -62,6 +65,7 @@ module OmniauthMacros
provider: 'google',
uid: 'google-test-uid-admin-1',
info: {
name: 'existing user admin name',
email: 'test-admin-1@google.com'
},
credentials: {