Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f27f14f4
Commit
f27f14f4
authored
Sep 04, 2020
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve invite bug on inviting a user
- was causing a regression where render_404 was being hit.
parent
63db21c1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
107 additions
and
64 deletions
+107
-64
app/controllers/invites_controller.rb
app/controllers/invites_controller.rb
+5
-1
app/models/member.rb
app/models/member.rb
+2
-2
changelogs/unreleased/241359-nomethoderror-undefined-method-invite_email-for-actionview-outputb.yml
...-undefined-method-invite_email-for-actionview-outputb.yml
+5
-0
spec/controllers/invites_controller_spec.rb
spec/controllers/invites_controller_spec.rb
+87
-61
spec/models/member_spec.rb
spec/models/member_spec.rb
+8
-0
No files found.
app/controllers/invites_controller.rb
View file @
f27f14f4
...
...
@@ -76,8 +76,12 @@ class InvitesController < ApplicationController
notice
<<
"or create an account"
if
Gitlab
::
CurrentSettings
.
allow_signup?
notice
=
notice
.
join
(
' '
)
+
"."
initial_member
=
Member
.
find_by_invite_token
(
params
[
:id
])
redirect_params
=
initial_member
?
{
invite_email:
member
.
invite_email
}
:
{}
store_location_for
:user
,
request
.
fullpath
redirect_to
new_user_session_path
(
invite_email:
member
.
invite_email
),
notice:
notice
redirect_to
new_user_session_path
(
redirect_params
),
notice:
notice
end
def
invite_details
...
...
app/models/member.rb
View file @
f27f14f4
...
...
@@ -161,8 +161,8 @@ class Member < ApplicationRecord
where
(
user_id:
user_ids
).
has_access
.
pluck
(
:user_id
,
:access_level
).
to_h
end
def
find_by_invite_token
(
invite_token
)
invite_token
=
Devise
.
token_generator
.
digest
(
self
,
:invite_token
,
invite_token
)
def
find_by_invite_token
(
raw_
invite_token
)
invite_token
=
Devise
.
token_generator
.
digest
(
self
,
:invite_token
,
raw_
invite_token
)
find_by
(
invite_token:
invite_token
)
end
...
...
changelogs/unreleased/241359-nomethoderror-undefined-method-invite_email-for-actionview-outputb.yml
0 → 100644
View file @
f27f14f4
---
title
:
'
Resolve
NoMethodError:
undefined
method
invite_email'
merge_request
:
41587
author
:
type
:
fixed
spec/controllers/invites_controller_spec.rb
View file @
f27f14f4
...
...
@@ -3,23 +3,26 @@
require
'spec_helper'
RSpec
.
describe
InvitesController
do
let
(
:token
)
{
'123456'
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let
(
:member
)
{
create
(
:project_member
,
:invited
,
invite_token:
token
,
invite_email:
user
.
email
)
}
let
(
:member
)
{
create
(
:project_member
,
:invited
,
invite_email:
user
.
email
)
}
let
(
:raw_invite_token
)
{
member
.
raw_invite_token
}
let
(
:project_members
)
{
member
.
source
.
users
}
let
(
:md5_member_global_id
)
{
Digest
::
MD5
.
hexdigest
(
member
.
to_global_id
.
to_s
)
}
let
(
:params
)
{
{
id:
raw_invite_token
}
}
before
do
stub_application_setting
(
snowplow_enabled:
true
,
snowplow_collector_hostname:
'localhost'
)
controller
.
instance_variable_set
(
:@member
,
member
)
sign_in
(
user
)
end
describe
'GET #show'
do
let
(
:params
)
{
{
id:
token
}
}
subject
(
:request
)
{
get
:show
,
params:
params
}
context
'when logged in'
do
before
do
sign_in
(
user
)
end
it
'accepts user if invite email matches signed in user'
do
expect
do
request
...
...
@@ -49,7 +52,7 @@ RSpec.describe InvitesController do
end
context
'when new_user_invite is experiment'
do
let
(
:params
)
{
{
id:
token
,
new_user_invite:
'experiment'
}
}
let
(
:params
)
{
{
id:
raw_invite_
token
,
new_user_invite:
'experiment'
}
}
it
'tracks the user as experiment group'
do
expect
(
Gitlab
::
Tracking
).
to
receive
(
:event
).
and_call_original
.
with
(
...
...
@@ -70,7 +73,7 @@ RSpec.describe InvitesController do
end
context
'when new_user_invite is control'
do
let
(
:params
)
{
{
id:
token
,
new_user_invite:
'control'
}
}
let
(
:params
)
{
{
id:
raw_invite_
token
,
new_user_invite:
'control'
}
}
it
'tracks the user as control group'
do
expect
(
Gitlab
::
Tracking
).
to
receive
(
:event
).
and_call_original
.
with
(
...
...
@@ -91,8 +94,31 @@ RSpec.describe InvitesController do
end
end
context
'when not logged in'
do
context
'when inviter is a member'
do
it
'is redirected to a new session with invite email param'
do
request
expect
(
response
).
to
redirect_to
(
new_user_session_path
(
invite_email:
member
.
invite_email
))
end
end
context
'when inviter is not a member'
do
let
(
:params
)
{
{
id:
'_bogus_token_'
}
}
it
'is redirected to a new session'
do
request
expect
(
response
).
to
redirect_to
(
new_user_session_path
)
end
end
end
end
describe
'POST #accept'
do
let
(
:params
)
{
{
id:
token
}
}
before
do
sign_in
(
user
)
end
subject
(
:request
)
{
post
:accept
,
params:
params
}
...
...
@@ -105,7 +131,7 @@ RSpec.describe InvitesController do
end
context
'when new_user_invite is experiment'
do
let
(
:params
)
{
{
id:
token
,
new_user_invite:
'experiment'
}
}
let
(
:params
)
{
{
id:
raw_invite_
token
,
new_user_invite:
'experiment'
}
}
it
'tracks the user as experiment group'
do
expect
(
Gitlab
::
Tracking
).
to
receive
(
:event
).
and_call_original
.
with
(
...
...
@@ -120,7 +146,7 @@ RSpec.describe InvitesController do
end
context
'when new_user_invite is control'
do
let
(
:params
)
{
{
id:
token
,
new_user_invite:
'control'
}
}
let
(
:params
)
{
{
id:
raw_invite_
token
,
new_user_invite:
'control'
}
}
it
'tracks the user as control group'
do
expect
(
Gitlab
::
Tracking
).
to
receive
(
:event
).
and_call_original
.
with
(
...
...
spec/models/member_spec.rb
View file @
f27f14f4
...
...
@@ -630,6 +630,14 @@ RSpec.describe Member do
end
end
describe
'.find_by_invite_token'
do
let!
(
:member
)
{
create
(
:project_member
,
invite_email:
"user@example.com"
,
user:
nil
)
}
it
'finds the member'
do
expect
(
described_class
.
find_by_invite_token
(
member
.
raw_invite_token
)).
to
eq
member
end
end
describe
"#invite_to_unknown_user?"
do
subject
{
member
.
invite_to_unknown_user?
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment