Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/controllers/auth_services_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def create

member = Member.find_by(email:)
member ||= Member.new(email:)
new_member = member.new_record?

member.name ||= omnihash[:info][:name]&.split(' ')&.first || ''
member.surname ||= omnihash[:info][:name]&.split(' ')&.drop(1)&.join(' ') || ''
Expand All @@ -55,6 +56,7 @@ def create
member_service = AuthService.find_by!(provider: omnihash[:provider],
uid: omnihash[:uid])
member = member_service.member
new_member = false
end

session[:member_id] = member.id
Expand All @@ -63,6 +65,7 @@ def create
session[:oauth_token_secret] = omnihash[:credentials][:secret]

if member.requires_additional_details?
session[:new_member] = new_member
redirect_to edit_member_details_path(member_type:)
else
redirect_to referer_or_dashboard_path
Expand Down
4 changes: 3 additions & 1 deletion app/controllers/member/details_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ class Member::DetailsController < ApplicationController

def edit
accept_terms
flash[notice] = I18n.t('notifications.signing_up')
if session.delete(:new_member)
flash[notice] = I18n.t('notifications.signing_up')
end
@member.newsletter ||= true
end

Expand Down
22 changes: 22 additions & 0 deletions spec/controllers/member/details_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,28 @@
allow(mailing_list).to receive_messages(subscribe: true, unsubscribe: true)
end

describe 'GET #edit' do
context 'when a brand-new member' do
it 'shows the signing up message' do
session[:new_member] = true

get :edit

expect(response.body).to include(I18n.t('notifications.signing_up'))
end
end

context 'when an existing member' do
it 'does not show the signing up message' do
session[:new_member] = false

get :edit

expect(response.body).not_to include(I18n.t('notifications.signing_up'))
end
end
end

describe 'PATCH #update' do
context 'with valid params' do
it 'updates how_you_found_us with radio option' do
Expand Down
16 changes: 16 additions & 0 deletions spec/requests/auth_services_callback_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,21 @@
post '/auth/github/callback'

expect(response).to redirect_to(edit_member_details_path)
expect(session[:new_member]).to be(true)
end

it 'does not mark an existing incomplete member as a new signup when they return to complete their profile' do
returning = Fabricate(:member, name: nil, surname: nil, about_you: nil,
email: 'returning@example.com')
returning.auth_services.delete_all
svc = Fabricate(:auth_service, member: returning,
provider: 'github', uid: 'returning-github-uid')
mock_auth_hash(provider: 'github', uid: svc.uid,
email: 'returning@example.com', name: nil)

post '/auth/github/callback'

expect(response).to redirect_to(edit_member_details_path)
expect(session[:new_member]).to be_nil
end
end