diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 13:05:53 -0500 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 13:05:53 -0500 |
| commit | bb883387f9e4d5564b455cce7d412f730664a2f5 (patch) | |
| tree | 02f972c30f9a01d605e2c88a22b2c7172694e475 /spec/models/user_spec.rb | |
| parent | 7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 (diff) | |
| parent | b7d83acf5b03e08dc9e387e1abb83c5e3c80444c (diff) | |
| download | gitlab-ce-bb883387f9e4d5564b455cce7d412f730664a2f5.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/models/note.rb
# db/schema.rb
# spec/models/note_spec.rb
Diffstat (limited to 'spec/models/user_spec.rb')
| -rw-r--r-- | spec/models/user_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index e170cc85a1e..77f745b2660 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -142,6 +142,7 @@ describe User, models: true do end describe '#confirm' do + before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(true) } let(:user) { create(:user, confirmed_at: nil, unconfirmed_email: 'test@gitlab.com') } it 'returns unconfirmed' do |