Skip to content

Commit

Permalink
Switch to minitest-capybara (fixes #2)
Browse files Browse the repository at this point in the history
Defer to minitest-capybara for all the integration to Minitest.
This means we now depend on minitest-matchers as well.
  • Loading branch information
blowmage committed Aug 2, 2012
1 parent b1078ee commit bb50742
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Rakefile
Expand Up @@ -18,8 +18,8 @@ Hoe.spec 'minitest-rails-capybara' do
self.readme_file = "README.rdoc" self.readme_file = "README.rdoc"
self.testlib = :minitest self.testlib = :minitest


extra_deps << ['minitest-rails'] dependency 'minitest-rails', '~> 0.1'
extra_deps << ['capybara'] dependency 'minitest-capybara', '~> 0.1'
end end


# vim: syntax=ruby # vim: syntax=ruby
5 changes: 4 additions & 1 deletion lib/minitest/rails/capybara.rb
@@ -1,7 +1,10 @@
require "minitest/rails" require "minitest/rails"
# Load minitest-matchers and fix Capybara::RSpecMatchers
require "minitest-capybara"
require "capybara/rails" require "capybara/rails"


class MiniTest::Rails::ActionDispatch::IntegrationTest class MiniTest::Rails::ActionDispatch::IntegrationTest
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers
include Capybara::RSpecMatchers
include Capybara::DSL include Capybara::DSL
end end
14 changes: 7 additions & 7 deletions minitest-rails-capybara.gemspec
Expand Up @@ -2,7 +2,7 @@


Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "minitest-rails-capybara" s.name = "minitest-rails-capybara"
s.version = "0.0.2.20120802073915" s.version = "0.0.2.20120802090439"


s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Mike Moore"] s.authors = ["Mike Moore"]
Expand All @@ -23,19 +23,19 @@ Gem::Specification.new do |s|
s.specification_version = 3 s.specification_version = 3


if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<minitest-rails>, [">= 0"]) s.add_runtime_dependency(%q<minitest-rails>, ["~> 0.1"])
s.add_runtime_dependency(%q<capybara>, [">= 0"]) s.add_runtime_dependency(%q<minitest-capybara>, ["~> 0.1"])
s.add_development_dependency(%q<rdoc>, ["~> 3.10"]) s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
s.add_development_dependency(%q<hoe>, ["~> 3.0"]) s.add_development_dependency(%q<hoe>, ["~> 3.0"])
else else
s.add_dependency(%q<minitest-rails>, [">= 0"]) s.add_dependency(%q<minitest-rails>, ["~> 0.1"])
s.add_dependency(%q<capybara>, [">= 0"]) s.add_dependency(%q<minitest-capybara>, ["~> 0.1"])
s.add_dependency(%q<rdoc>, ["~> 3.10"]) s.add_dependency(%q<rdoc>, ["~> 3.10"])
s.add_dependency(%q<hoe>, ["~> 3.0"]) s.add_dependency(%q<hoe>, ["~> 3.0"])
end end
else else
s.add_dependency(%q<minitest-rails>, [">= 0"]) s.add_dependency(%q<minitest-rails>, ["~> 0.1"])
s.add_dependency(%q<capybara>, [">= 0"]) s.add_dependency(%q<minitest-capybara>, ["~> 0.1"])
s.add_dependency(%q<rdoc>, ["~> 3.10"]) s.add_dependency(%q<rdoc>, ["~> 3.10"])
s.add_dependency(%q<hoe>, ["~> 3.0"]) s.add_dependency(%q<hoe>, ["~> 3.0"])
end end
Expand Down

0 comments on commit bb50742

Please sign in to comment.