Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
b62e1d87
Commit
b62e1d87
authored
8 years ago
by
Cam Saül
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2970 from metabase/fix-ci-test-failure
Fix CI Test failures
parents
32b3332d
e96f14bf
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/metabase/email.clj
+2
-1
2 additions, 1 deletion
src/metabase/email.clj
test/metabase/api/session_test.clj
+2
-1
2 additions, 1 deletion
test/metabase/api/session_test.clj
with
4 additions
and
2 deletions
src/metabase/email.clj
+
2
−
1
View file @
b62e1d87
...
...
@@ -43,7 +43,8 @@
[
&
{
:keys
[
subject
recipients
message-type
message
]}]
{
:pre
[(
string?
subject
)
(
sequential?
recipients
)
(
every?
u/is-email?
recipients
)
(
or
(
every?
u/is-email?
recipients
)
(
log/error
"recipients contains an invalid email:"
recipients
))
(
contains?
#
{
:text
:html
:attachments
}
message-type
)
(
if
(
=
message-type
:attachments
)
(
sequential?
message
)
(
string?
message
))]}
(
try
...
...
This diff is collapsed.
Click to expand it.
test/metabase/api/session_test.clj
+
2
−
1
View file @
b62e1d87
...
...
@@ -241,6 +241,7 @@
;; test that a user that doesn't exist with the *same* domain as the auto-create accounts domain means a new user gets created
(
expect
(
with-temporary-setting-values
[
google-auth-auto-create-accounts-domain
"sf-toucannery.com"
]
(
with-temporary-setting-values
[
google-auth-auto-create-accounts-domain
"sf-toucannery.com"
admin-email
"rasta@toucans.com"
]
(
u/prog1
(
is-session?
(
google-auth-fetch-or-create-user!
"Rasta"
"Toucan"
"rasta@sf-toucannery.com"
))
(
db/cascade-delete!
User
:email
"rasta@sf-toucannery.com"
))))
; clean up after ourselves
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment