Skip to content
This repository has been archived by the owner on Feb 15, 2020. It is now read-only.

Commit

Permalink
Feature/rails 4 compatibility (#3)
Browse files Browse the repository at this point in the history
* Allow activejob and actionmailer >= 4 for Rails 4

* Fix queue_adapter message typo

* Bump version to 0.1.2

* Bundle install after bumping version
  • Loading branch information
jdlubrano authored Jan 25, 2018
1 parent 5992ae5 commit 91fe655
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PATH
remote: .
specs:
deliver_later_matchers (0.1.1)
actionmailer (~> 5.0)
activejob (~> 5.0)
deliver_later_matchers (0.1.2)
actionmailer (>= 4.0)
activejob (>= 4.0)
rspec-expectations (~> 3.0)
rspec-mocks (~> 3.0)
rspec-rails (~> 3.0)
Expand Down Expand Up @@ -58,7 +58,7 @@ GEM
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
minitest (5.11.2)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
rack (2.0.3)
Expand Down
4 changes: 2 additions & 2 deletions deliver_later_matchers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']

spec.add_dependency 'actionmailer', '~> 5.0'
spec.add_dependency 'activejob', '~> 5.0'
spec.add_dependency 'actionmailer', '>= 4.0'
spec.add_dependency 'activejob', '>= 4.0'
spec.add_dependency 'rspec-expectations', '~> 3.0'
spec.add_dependency 'rspec-mocks', '~> 3.0'
spec.add_dependency 'rspec-rails', '~> 3.0'
Expand Down
2 changes: 1 addition & 1 deletion lib/deliver_later_matchers/deliver_later.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def queue_adapter
def check_job_adapter
return if queue_adapter.is_a?(::ActiveJob::QueueAdapters::TestAdapter)

raise RuntimeError, "To use DeliverLaterMatchers, set `ActiveJob::Base.queue_adpater = :test`."
raise RuntimeError, "To use DeliverLaterMatchers, set `ActiveJob::Base.queue_adapter = :test`."
end
end
end
2 changes: 1 addition & 1 deletion lib/deliver_later_matchers/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module DeliverLaterMatchers
VERSION = "0.1.1"
VERSION = '0.1.2'
end
2 changes: 1 addition & 1 deletion spec/deliver_later_matchers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def email_with_args(arg1, arg2)
ActiveJob::Base.queue_adapter = :async

expect { expect { TestMailer.test_email.deliver_later }.to deliver_later(TestMailer, :test_email) }
.to raise_error(RuntimeError, "To use DeliverLaterMatchers, set `ActiveJob::Base.queue_adpater = :test`.")
.to raise_error(RuntimeError, "To use DeliverLaterMatchers, set `ActiveJob::Base.queue_adapter = :test`.")
end
end

Expand Down

0 comments on commit 91fe655

Please sign in to comment.