diff --git a/Gemfile b/Gemfile index 30cbd1bf..6317e894 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,14 @@ source "https://rubygems.org" gemspec +if 'Integration test (cucumber) suite is 1.9+ only'.respond_to? :encoding + gem 'aruba', '~> 0.5.1' + gem 'capybara', '~> 2.0' + gem 'poltergeist', '~> 1.1.0' + gem 'phantomjs', '~> 1.8.1' + gem 'cucumber', '>= 1.1.0' +end + # Uncomment this to use local copy of simplecov-html in development when checked out # gem 'simplecov-html', :path => ::File.dirname(__FILE__) + '/../simplecov-html' diff --git a/Rakefile b/Rakefile index 0b8d8930..e2cdd05d 100644 --- a/Rakefile +++ b/Rakefile @@ -21,7 +21,12 @@ Rake::TestTask.new(:test) do |test| test.warning = true end -require 'cucumber/rake/task' -Cucumber::Rake::Task.new +# Cucumber integration test suite is for impls that work with simplecov only - a.k.a. 1.9+ +if '1.9+'.respond_to? :encoding + require 'cucumber/rake/task' + Cucumber::Rake::Task.new + task :default => [:test, :cucumber] +else + task :default => [:test] +end -task :default => [:test, :cucumber] diff --git a/gemfiles/multi_json_legacy.gemfile b/gemfiles/multi_json_legacy.gemfile index b0cd16ad..9fced124 100644 --- a/gemfiles/multi_json_legacy.gemfile +++ b/gemfiles/multi_json_legacy.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "aruba", "~> 0.5.1" +gem "capybara", "~> 2.0" +gem "poltergeist", "~> 1.1.0" +gem "phantomjs", "~> 1.8.1" +gem "cucumber", ">= 1.1.0" gem "multi_json", "~> 1.0.0" gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/multi_json_new.gemfile b/gemfiles/multi_json_new.gemfile index a9a640fe..601cf2a6 100644 --- a/gemfiles/multi_json_new.gemfile +++ b/gemfiles/multi_json_new.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "aruba", "~> 0.5.1" +gem "capybara", "~> 2.0" +gem "poltergeist", "~> 1.1.0" +gem "phantomjs", "~> 1.8.1" +gem "cucumber", ">= 1.1.0" gem "multi_json", ">= 1.3.4" gemspec :path=>"../" \ No newline at end of file diff --git a/simplecov.gemspec b/simplecov.gemspec index 034e4605..72857167 100644 --- a/simplecov.gemspec +++ b/simplecov.gemspec @@ -16,12 +16,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'multi_json' gem.add_dependency 'simplecov-html', '~> 0.7.1' - gem.add_development_dependency 'aruba', '~> 0.5.1' - gem.add_development_dependency 'capybara', '~> 2.0' - gem.add_development_dependency 'poltergeist', '~> 1.1.0' - gem.add_development_dependency 'phantomjs', '~> 1.8.1' gem.add_development_dependency 'appraisal', '~> 0.5.1' - gem.add_development_dependency 'cucumber', '>= 1.1.0' gem.add_development_dependency 'rake', '~> 10.0.3' gem.add_development_dependency 'rspec', '~> 2.13.0' gem.add_development_dependency 'shoulda', '~> 3.4.0'