Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
350f2ba7
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
350f2ba7
编写于
11月 15, 2018
作者:
I
Imre Farkas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
User#find_by_any_email to respect confirmed flag on secondary emails
上级
3b23d06c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
6 deletion
+37
-6
app/models/user.rb
app/models/user.rb
+1
-1
changelogs/unreleased/ce-54109-fix_user_by_any_email.yml
changelogs/unreleased/ce-54109-fix_user_by_any_email.yml
+5
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+31
-5
未找到文件。
app/models/user.rb
浏览文件 @
350f2ba7
...
...
@@ -363,7 +363,7 @@ class User < ActiveRecord::Base
from_users
=
from_users
.
confirmed
if
confirmed
from_emails
=
joins
(
:emails
).
where
(
emails:
{
email:
emails
})
from_emails
=
from_emails
.
confirmed
if
confirmed
from_emails
=
from_emails
.
confirmed
.
merge
(
Email
.
confirmed
)
if
confirmed
items
=
[
from_users
,
from_emails
]
...
...
changelogs/unreleased/ce-54109-fix_user_by_any_email.yml
0 → 100644
浏览文件 @
350f2ba7
---
title
:
User#find_by_any_email to respect confirmed flag on secondary emails
merge_request
:
23181
author
:
type
:
fixed
spec/models/user_spec.rb
浏览文件 @
350f2ba7
...
...
@@ -1137,12 +1137,38 @@ describe User do
expect
(
described_class
.
find_by_any_email
(
user
.
email
.
upcase
,
confirmed:
true
)).
to
eq
user
end
it
'finds by secondary email'
do
email
=
create
(
:email
,
email:
'foo@example.com'
)
user
=
email
.
user
context
'finds by secondary email'
do
let
(
:user
)
{
email
.
user
}
expect
(
described_class
.
find_by_any_email
(
email
.
email
)).
to
eq
user
expect
(
described_class
.
find_by_any_email
(
email
.
email
,
confirmed:
true
)).
to
eq
user
context
'primary email confirmed'
do
context
'secondary email confirmed'
do
let!
(
:email
)
{
create
(
:email
,
:confirmed
,
email:
'foo@example.com'
)
}
it
'finds user respecting the confirmed flag'
do
expect
(
described_class
.
find_by_any_email
(
email
.
email
)).
to
eq
user
expect
(
described_class
.
find_by_any_email
(
email
.
email
,
confirmed:
true
)).
to
eq
user
end
end
context
'secondary email not confirmed'
do
let!
(
:email
)
{
create
(
:email
,
email:
'foo@example.com'
)
}
it
'finds user respecting the confirmed flag'
do
expect
(
described_class
.
find_by_any_email
(
email
.
email
)).
to
eq
user
expect
(
described_class
.
find_by_any_email
(
email
.
email
,
confirmed:
true
)).
to
be_nil
end
end
end
context
'primary email not confirmed'
do
let
(
:user
)
{
create
(
:user
,
confirmed_at:
nil
)
}
let!
(
:email
)
{
create
(
:email
,
:confirmed
,
user:
user
,
email:
'foo@example.com'
)
}
it
'finds user respecting the confirmed flag'
do
expect
(
described_class
.
find_by_any_email
(
email
.
email
)).
to
eq
user
expect
(
described_class
.
find_by_any_email
(
email
.
email
,
confirmed:
true
)).
to
be_nil
end
end
end
it
'returns nil when nothing found'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录