Skip to content

Commit

Permalink
Some additional cleanup to remove 1.8.6/1.9.1 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
myronmarston committed Sep 11, 2011
1 parent 1a22b73 commit c812e28
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 24 deletions.
10 changes: 3 additions & 7 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ task :cleanup_rcov_files do
rm_rf 'coverage.data'
end

unless RUBY_VERSION == '1.8.6'
require 'cucumber/rake/task'
Cucumber::Rake::Task.new
end
require 'cucumber/rake/task'
Cucumber::Rake::Task.new

task :default => [:spec, :cucumber]

Expand All @@ -52,10 +50,8 @@ namespace :ci do
t.rspec_opts = %w[--format progress --backtrace]
end

ci_tasks = [:setup, :spec]
ci_tasks << :cucumber if %w[ 1.8.7 1.9.2 1.9.3 ].include?(RUBY_VERSION) && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')
desc "Run a ci build"
task :build => ci_tasks
task :build => [:setup, :spec, :cucumber]
end

def ensure_relish_doc_symlinked(filename)
Expand Down
4 changes: 0 additions & 4 deletions cucumber.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ interp_opts = if defined?(RUBY_ENGINE)
else
''
end
if ENV['TRAVIS'] && RUBY_VERSION == '1.8.6'
interp_opts << ' --tags ~@exclude-travis-186'
end
%>
default: <%= std_opts %><%= interp_opts %> features
wip: --tags @wip:30 --wip features<%= interp_opts %>
Expand Down
2 changes: 0 additions & 2 deletions features/support/http_lib_filters.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ def cell_values
# on JRuby. I'm not sure why, and there's little benefit to running
# them on JRuby...so we just skip them. Excon seems to have the same issue :(.
UNSUPPORTED_HTTP_LIBS = c_dependent_libs + %w[ httpclient excon ]
elsif RUBY_VERSION == '1.8.6' && ENV['TRAVIS']
UNSUPPORTED_HTTP_LIBS = %w[ em-http-request ]
end

if defined?(UNSUPPORTED_HTTP_LIBS)
Expand Down
5 changes: 1 addition & 4 deletions lib/vcr/request_matcher.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ def ==(other)
end

def hash
# on Ruby 1.8.6, identical sets have different hash values,
# but identical arrays have the same hash values,
# so we convert match_attributes to an array here.
[match_attributes.to_a, method, uri, sorted_header_array, body].hash
[match_attributes, method, uri, sorted_header_array, body].hash
end

private
Expand Down
8 changes: 1 addition & 7 deletions spec/support/shared_example_groups/http_library.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@
raise ArgumentError.new("No http library adapter module could be found for #{library}")
end

http_lib_unsupported = if RUBY_INTERPRETER == :mri
# em-http-request is causing issues on 1.8.6 on travis like:
# ruby: symbol lookup error: /home/travis/.rvm/gems/ruby-1.8.6-p420/gems/em-http-request-0.3.0/lib/http11_client.so: undefined symbol: rb_hash_lookup
library =~ /em-http/ && RUBY_VERSION == '1.8.6' && ENV['TRAVIS']
else
library =~ /(typhoeus|curb|patron|em-http)/
end
http_lib_unsupported = (RUBY_INTERPRETER != :mri && library =~ /(typhoeus|curb|patron|em-http)/)

describe "using #{adapter_module.http_library_name}", :unless => http_lib_unsupported do
include adapter_module
Expand Down

0 comments on commit c812e28

Please sign in to comment.