diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-05-21 18:41:31 -0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 12:13:46 +0200 |
| commit | 20a871cc21227ef67d9173ba9bd3b7e0d0e2e26f (patch) | |
| tree | 449eeb821d4fa49ec9b86731a443484d3c23b01a /spec | |
| parent | 5a9ede472150ec78f8410ae15cf782095c8f056c (diff) | |
| download | gitlab-ce-20a871cc21227ef67d9173ba9bd3b7e0d0e2e26f.tar.gz | |
Update email_spec gem
This fixes spec/mailers/notify_spec
Also only require email_spec in the one place it's used
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/mailers/notify_spec.rb | 1 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index c40ae7b5703..89853d05161 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -1,4 +1,5 @@ require 'spec_helper' +require 'email_spec' describe Notify do include EmailSpec::Helpers diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9c8004ab555..666d56079d7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,7 +2,6 @@ ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'shoulda/matchers' -require 'email_spec' require 'sidekiq/testing/inline' # Requires supporting ruby files with custom matchers and macros, etc, |