diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-01 14:58:55 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-01 14:58:55 +0000 |
| commit | 27077ab21e56ea1ef2e18488fa2ec5940062f86a (patch) | |
| tree | 2f51f6ea3952bee7b75a507827b2e36f11ca1b9b /spec | |
| parent | 30e28a7e0c458395b7a205e72a89e7d1b68571eb (diff) | |
| parent | 25a566da0aae470d7819820500e9343c7f462dfc (diff) | |
| download | gitlab-ce-27077ab21e56ea1ef2e18488fa2ec5940062f86a.tar.gz | |
Merge branch 'remove_password_argument' into 'master'
Remove unused password argument
We no longer put a (random) password in the 'new user' email, so no need to pass it around in the code.
See merge request !1279
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/mailers/notify_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index e06e8826e5c..a0c37587b23 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -46,7 +46,7 @@ describe Notify do token = 'kETLwRaayvigPq_x3SNM' - subject { Notify.new_user_email(new_user.id, new_user.password, token) } + subject { Notify.new_user_email(new_user.id, token) } it_behaves_like 'an email sent from GitLab' @@ -83,7 +83,7 @@ describe Notify do let(:example_site_path) { root_path } let(:new_user) { create(:user, email: 'newguy@example.com', password: "securePassword") } - subject { Notify.new_user_email(new_user.id, new_user.password) } + subject { Notify.new_user_email(new_user.id) } it_behaves_like 'an email sent from GitLab' |