Skip to content

Commit

Permalink
Moved integration test suite dependencies and tasks to
Browse files Browse the repository at this point in the history
Gemfile because poltergeist cannot be installed on Ruby < 1.9.2
as per it's gemspec. The integration suite is meant for 1.9+
only, anyway.

See #206
  • Loading branch information
colszowka committed Mar 23, 2013
1 parent b8c174a commit 1a70b10
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 8 deletions.
8 changes: 8 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
11 changes: 8 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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]
5 changes: 5 additions & 0 deletions gemfiles/multi_json_legacy.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=>"../"
5 changes: 5 additions & 0 deletions gemfiles/multi_json_new.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=>"../"
5 changes: 0 additions & 5 deletions simplecov.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 1a70b10

Please sign in to comment.