diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-10-05 12:48:22 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-10-05 12:48:22 +0200 |
| commit | 0c0c2ecd99cd5c4cb22a0c045f8d45d315203832 (patch) | |
| tree | 3900ccdcdff0cd6b8e3ed281ba57a317b801ad08 /spec/services/emails | |
| parent | ed3c25e4294bfc75f7167ed63e30561e39ac3a97 (diff) | |
| parent | de01353b166018a43ea92b38054b1267c3ba5cea (diff) | |
| download | gitlab-ce-0c0c2ecd99cd5c4cb22a0c045f8d45d315203832.tar.gz | |
Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
# Conflicts:
# app/controllers/admin/users_controller.rb
# app/controllers/confirmations_controller.rb
# app/controllers/profiles/emails_controller.rb
# app/models/user.rb
# app/services/emails/base_service.rb
# app/services/emails/destroy_service.rb
# app/views/devise/mailer/confirmation_instructions.html.haml
# lib/api/users.rb
# spec/services/emails/destroy_service_spec.rb
Diffstat (limited to 'spec/services/emails')
| -rw-r--r-- | spec/services/emails/create_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/emails/destroy_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb index d028ee27a16..54692c88623 100644 --- a/spec/services/emails/create_service_spec.rb +++ b/spec/services/emails/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Emails::CreateService do let(:user) { create(:user) } - let(:opts) { { email: 'new@email.com' } } + let(:opts) { { email: 'new@email.com', user: user } } subject(:service) { described_class.new(user, opts) } diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb index 200e33a78cf..c3204fac3df 100644 --- a/spec/services/emails/destroy_service_spec.rb +++ b/spec/services/emails/destroy_service_spec.rb @@ -4,7 +4,7 @@ describe Emails::DestroyService do let!(:user) { create(:user) } let!(:email) { create(:email, user: user) } - subject(:service) { described_class.new(user) } + subject(:service) { described_class.new(user, user: user) } describe '#execute' do it 'removes an email' do |