summaryrefslogtreecommitdiff
path: root/spec/mailers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-19 21:15:13 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-19 21:15:13 -0400
commit69723d20024821fb4206e899ffa3acd2da690315 (patch)
tree55c9888c6652d9ca0ff78a6b584804cd47aed63e /spec/mailers
parentce8f78a57168bbacb1320a4dc4e9e79b878221d4 (diff)
downloadgitlab-ce-69723d20024821fb4206e899ffa3acd2da690315.tar.gz
Devise 3.5.x deprecates `confirm!` in favor of `confirm`
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/notify_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 97c07ad7d55..2c97a521d96 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -712,7 +712,7 @@ describe Notify do
before do
user.update_attribute(:email, "user@company.com")
- user.confirm!
+ user.confirm
end
it "is sent from the committer email" do
@@ -730,7 +730,7 @@ describe Notify do
before do
user.update_attribute(:email, "user@something.company.com")
- user.confirm!
+ user.confirm
end
it "is sent from the default email" do
@@ -748,7 +748,7 @@ describe Notify do
before do
user.update_attribute(:email, "user@mpany.com")
- user.confirm!
+ user.confirm
end
it "is sent from the default email" do