diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-24 10:52:22 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-24 10:52:22 +0000 |
| commit | ed256037427f1a9b92fabe430e392e600720a29f (patch) | |
| tree | 9f6c67513d5ab827b035055c4bdece92e94b37ae | |
| parent | 1a7ba2a5e8603222b51a9e9cf0ffcde68cf593d2 (diff) | |
| parent | 204da00ea0dc52c6746b160fd698e07f55a7fc00 (diff) | |
| download | gitlab-ce-ed256037427f1a9b92fabe430e392e600720a29f.tar.gz | |
Merge branch '#22609' into 'master'
Moves `spec/mailers/shared/notify.rb` to `spec/support/notify_shared_examples.rb`
Closes #22609
See merge request !6605
| -rw-r--r-- | spec/mailers/emails/builds_spec.rb | 1 | ||||
| -rw-r--r-- | spec/mailers/emails/merge_requests_spec.rb | 1 | ||||
| -rw-r--r-- | spec/mailers/emails/profile_spec.rb | 1 | ||||
| -rw-r--r-- | spec/mailers/notify_spec.rb | 1 | ||||
| -rw-r--r-- | spec/support/notify_shared_examples.rb (renamed from spec/mailers/shared/notify.rb) | 0 |
5 files changed, 0 insertions, 4 deletions
diff --git a/spec/mailers/emails/builds_spec.rb b/spec/mailers/emails/builds_spec.rb index 0df89938e97..d968096783c 100644 --- a/spec/mailers/emails/builds_spec.rb +++ b/spec/mailers/emails/builds_spec.rb @@ -1,6 +1,5 @@ require 'spec_helper' require 'email_spec' -require 'mailers/shared/notify' describe Notify do include EmailSpec::Matchers diff --git a/spec/mailers/emails/merge_requests_spec.rb b/spec/mailers/emails/merge_requests_spec.rb index 4d3811af254..e22858d1d8f 100644 --- a/spec/mailers/emails/merge_requests_spec.rb +++ b/spec/mailers/emails/merge_requests_spec.rb @@ -1,6 +1,5 @@ require 'spec_helper' require 'email_spec' -require 'mailers/shared/notify' describe Notify, "merge request notifications" do include EmailSpec::Matchers diff --git a/spec/mailers/emails/profile_spec.rb b/spec/mailers/emails/profile_spec.rb index 781472d0c00..14bc062ef12 100644 --- a/spec/mailers/emails/profile_spec.rb +++ b/spec/mailers/emails/profile_spec.rb @@ -1,6 +1,5 @@ require 'spec_helper' require 'email_spec' -require 'mailers/shared/notify' describe Notify do include EmailSpec::Matchers diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index c8207e58e90..f5f3f58613d 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -1,6 +1,5 @@ require 'spec_helper' require 'email_spec' -require 'mailers/shared/notify' describe Notify do include EmailSpec::Helpers diff --git a/spec/mailers/shared/notify.rb b/spec/support/notify_shared_examples.rb index 3956d05060b..3956d05060b 100644 --- a/spec/mailers/shared/notify.rb +++ b/spec/support/notify_shared_examples.rb |