summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAlexandra <brett@digitalmoksha.com>2017-10-01 17:07:26 +0200
committerAlexandra <brett@digitalmoksha.com>2017-10-01 17:07:26 +0200
commited3c25e4294bfc75f7167ed63e30561e39ac3a97 (patch)
tree1c00af6738e0742e9d2140222ebdea669c8b6c37 /spec
parent39fbac868197442053d058023206f84f63473551 (diff)
downloadgitlab-ce-ed3c25e4294bfc75f7167ed63e30561e39ac3a97.tar.gz
spacing and small optimisations
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/profiles/emails_controller_spec.rb7
-rw-r--r--spec/models/email_spec.rb3
2 files changed, 7 insertions, 3 deletions
diff --git a/spec/controllers/profiles/emails_controller_spec.rb b/spec/controllers/profiles/emails_controller_spec.rb
index 69b34db0c2e..ecf14aad54f 100644
--- a/spec/controllers/profiles/emails_controller_spec.rb
+++ b/spec/controllers/profiles/emails_controller_spec.rb
@@ -11,7 +11,7 @@ describe Profiles::EmailsController do
let(:email_params) { { email: "add_email@example.com" } }
it 'sends an email confirmation' do
- expect {post(:create, { email: email_params })}.to change { ActionMailer::Base.deliveries.size }
+ expect { post(:create, { email: email_params }) }.to change { ActionMailer::Base.deliveries.size }
expect(ActionMailer::Base.deliveries.last.to).to eq [email_params[:email]]
expect(ActionMailer::Base.deliveries.last.subject).to match "Confirmation instructions"
end
@@ -22,13 +22,14 @@ describe Profiles::EmailsController do
it 'resends an email confirmation' do
email = user.emails.create(email: 'add_email@example.com')
- expect {put(:resend_confirmation_instructions, { id: email })}.to change { ActionMailer::Base.deliveries.size }
+
+ expect { put(:resend_confirmation_instructions, { id: email }) }.to change { ActionMailer::Base.deliveries.size }
expect(ActionMailer::Base.deliveries.last.to).to eq [email_params[:email]]
expect(ActionMailer::Base.deliveries.last.subject).to match "Confirmation instructions"
end
it 'unable to resend an email confirmation' do
- expect {put(:resend_confirmation_instructions, { id: 1 })}.not_to change { ActionMailer::Base.deliveries.size }
+ expect { put(:resend_confirmation_instructions, { id: 1 }) }.not_to change { ActionMailer::Base.deliveries.size }
end
end
end
diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb
index 3fd3fe03be5..b32dd31ae6d 100644
--- a/spec/models/email_spec.rb
+++ b/spec/models/email_spec.rb
@@ -22,7 +22,9 @@ describe Email do
it 'synchronizes the gpg keys when the email is updated' do
email = user.emails.create(email: 'new@email.com')
+
expect(user).to receive(:update_invalid_gpg_signatures)
+
email.confirm
end
end
@@ -33,6 +35,7 @@ describe Email do
it 'scopes confirmed emails' do
create(:email, :confirmed, user: user)
create(:email, user: user)
+
expect(user.emails.count).to eq 2
expect(user.emails.confirmed.count).to eq 1
end