diff --git a/test/helper.rb b/test/helper.rb index b499f52..22a23d0 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -8,7 +8,7 @@ exit e.status_code end require 'test/unit' -require 'shoulda' +require 'shoulda/context' require 'webmock/test_unit' require 'vcr' diff --git a/webrobots.gemspec b/webrobots.gemspec index 65eb9a2..7a3f617 100644 --- a/webrobots.gemspec +++ b/webrobots.gemspec @@ -30,17 +30,9 @@ This library helps write robots.txt compliant web robots in Ruby. s.add_development_dependency("rake", [">= 0.9.2.2"]) s.add_development_dependency("racc", [">= 0"]) unless RUBY_PLATFORM == "java" s.add_development_dependency("test-unit") - s.add_development_dependency("shoulda", [RUBY_VERSION < "1.9" ? "< 3.5.0" : ">= 0"]) + s.add_development_dependency("shoulda-context") s.add_development_dependency("webmock") - if RUBY_VERSION < "1.9" - s.add_development_dependency('i18n', '< 0.7.0') - # Cap dependency on activesupport with < 4.0 on behalf of - # shoulda-matchers to satisfy bundler. - s.add_development_dependency("activesupport", ["< 4.0"]) - s.add_development_dependency("vcr", '< 3') - else - s.add_development_dependency("vcr") - end + s.add_development_dependency("vcr") s.add_development_dependency("rdoc", ["> 2.4.2"]) s.add_development_dependency("bundler", ["~> 1.2", ">= 1.2"]) s.add_development_dependency("nokogiri", ">= 1.4.7", [RUBY_VERSION < "1.9" ? "< 1.6.0" : "~> 1.4"])