Skip to content

Commit 210fb4d

Browse files
authored
Unlock mail gem version for newer ruby versions (#146)
## What Alternate workaround to #135 and #143. ## Why While there still seems to be an [issue with `add_mail` "clearing" `body`,](mikel/mail#1539) instead of locking the gem for all ruby version and making it difficult to test newer ones, we can limit the version restrictions to legacy version and use this workaround of flipping the order for Ruby 2.x.
1 parent 386a6a7 commit 210fb4d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

gemfiles/Gemfile.legacy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ group :test do
1010
gem 'rspec-its', '~> 1.2'
1111
gem 'fakeweb', :git => 'https://github.com/chrisk/fakeweb.git'
1212
gem 'fakeweb-matcher'
13+
gem 'mail', '~> 2.7.0'
1314
gem 'mime-types', '~> 1.25.1'
15+
gem 'mini_mime', '< 1.1.4'
1416
gem 'activesupport', '~> 3.2.0'
1517
gem 'i18n', '~> 0.6.0'
1618
gem 'yajl-ruby', '~> 1.0', '< 1.4.0', :platforms => [:mingw, :mswin, :ruby]

postmark.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
3434

3535
s.add_dependency "json"
3636

37-
s.add_development_dependency "mail", "~> 2.7.0" # https://github.com/mikel/mail/pull/1539
38-
s.add_development_dependency "mini_mime", "< 1.1.4"
37+
s.add_development_dependency "mail"
3938
s.add_development_dependency "rake"
4039
end

spec/unit/postmark/mail_message_converter_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
119119
120120
subject "Hello!"
121-
body "Hello Sheldon!"
122121
add_file empty_gif_path
122+
body "Hello Sheldon!"
123123
end
124124
end
125125

0 commit comments

Comments
 (0)