diff options
author | Robert Speicher <robert@gitlab.com> | 2016-07-01 20:27:26 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-07-01 20:27:26 +0000 |
commit | 31d73135b73c138af4404bd006f33a2ae28f9293 (patch) | |
tree | f2bc8f8f62689ba0f3ef29678fa77573fb5a4f77 /spec/mailers/notify_spec.rb | |
parent | d6efef0f2aeb982dcd64c63db1ec8b4946f77a31 (diff) | |
parent | 9e211091a85c20adea63b89111240350d6d8ffcb (diff) | |
download | gitlab-ce-31d73135b73c138af4404bd006f33a2ae28f9293.tar.gz |
Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master'
Enable Style/EmptyLines Rubocop cop
#17478
See merge request !5013
Diffstat (limited to 'spec/mailers/notify_spec.rb')
-rw-r--r-- | spec/mailers/notify_spec.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index ae55a01ebea..016856a62f8 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -984,7 +984,6 @@ describe Notify do end context "when set to send from committer email if domain matches" do - let(:send_from_committer_email) { true } before do @@ -992,7 +991,6 @@ describe Notify do end context "when the committer email domain is within the GitLab domain" do - before do user.update_attribute(:email, "user@company.com") user.confirm @@ -1010,7 +1008,6 @@ describe Notify do end context "when the committer email domain is not completely within the GitLab domain" do - before do user.update_attribute(:email, "user@something.company.com") user.confirm @@ -1028,7 +1025,6 @@ describe Notify do end context "when the committer email domain is outside the GitLab domain" do - before do user.update_attribute(:email, "user@mpany.com") user.confirm @@ -1084,5 +1080,4 @@ describe Notify do is_expected.to have_body_text /#{diff_path}/ end end - end |