Skip to content

Commit

Permalink
Rails 4.0!
Browse files Browse the repository at this point in the history
  • Loading branch information
ream88 committed Jul 8, 2013
1 parent 6e6eeb3 commit 057c96d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ gemfile:
- gemfiles/Rails_3_0.gemfile
- gemfiles/Rails_3_1.gemfile
- gemfiles/Rails_3_2.gemfile
- gemfiles/Rails_4_0.gemfile
- gemfiles/Rails_master.gemfile

branches:
Expand All @@ -21,6 +22,8 @@ matrix:
exclude:
- rvm: 1.9.2
gemfile: gemfiles/Rails_master.gemfile
- rvm: 1.9.2
gemfile: gemfiles/Rails_4_0.gemfile
allow_failures:
- rvm: ruby-head
- gemfile: gemfiles/Rails_master.gemfile
2 changes: 1 addition & 1 deletion simple_postmark.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
gem.add_dependency 'json'
gem.add_dependency 'mail'

gem.add_development_dependency 'minitest', '~> 4.0'
gem.add_development_dependency 'minitest'
gem.add_development_dependency 'rails', '>= 3.0'
gem.add_development_dependency 'webmock'
end
6 changes: 3 additions & 3 deletions spec/integration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def email_with_tags

def email_with_attachments
attachments['thebrocode.jpg'] = File.read(File.join(File.dirname(__FILE__), 'thebrocode.jpg'))

mail(subject: 'SimplePostmark with Attachments') do |as|
as.text { render(text: text) }
end
Expand Down Expand Up @@ -74,13 +74,13 @@ def email_with_reply_to

it 'is silent if raise_delivery_errors is not set' do
ActionMailer::Base.raise_delivery_errors = false

IntegrationMailer.email.deliver
end


it 'raises a SimplePostmark::APIError containing the error from postmarkapp.com if raise_delivery_errors is set' do
-> { IntegrationMailer.email.deliver }.must_raise(SimplePostmark::APIError)
->{ IntegrationMailer.email.deliver }.must_raise(SimplePostmark::APIError)
end
end

Expand Down

0 comments on commit 057c96d

Please sign in to comment.