gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-17 05:34:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conflicts

Browse source
This commit is contained in:
Stella Rouzi 2014-08-12 15:48:29 +03:00
parent e2fb434dc7
commit 71dfb3b7e4
34 changed files with 160 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec/features/omniauth_spec.rb
View file

@ -1,8 +1,6 @@
require 'spec_helper'
feature Openid do
let!(:participant_role) { create(:participant_role) }
shared_examples 'sign in with openid' do
scenario 'has option to log in with Google account' do
@ -26,7 +24,7 @@ feature Openid do
end
scenario 'signs in an existing user' do
create(:participant, email: 'test-participant-1@google.com')
create(:user, email: 'test-participant-1@google.com')
expected_count_openid = Openid.count + 1
expected_count_user = User.count
visit '/accounts/sign_in'
@ -53,7 +51,7 @@ feature Openid do
scenario 'adds openid to existing user' do
# Sign in user
user = create(:participant, email: 'test-participant-1@google.com')
user = create(:user, email: 'test-participant-1@google.com')
sign_in user
# Add openID to current user
@ -73,7 +71,7 @@ feature Openid do
scenario 'signs in with openID using the same email as another associated openid' do
# Sign in user
create(:participant, email: 'test-participant-1@google.com')
create(:user, email: 'test-participant-1@google.com')
expected_count_openid = Openid.count + 1
expected_count_user = User.count
visit '/accounts/sign_in'