Permalink
Browse files

Backs out aruba upgrade as it seems to be broken on JRuby

This reverts commit ed121c0.
This reverts commit a3f45f9.
  • Loading branch information...
1 parent ed121c0 commit 351fb0d7778c7b787440dfdca4a6073f586fd888 @alindeman alindeman committed Oct 16, 2012
Showing with 5 additions and 3 deletions.
  1. +4 −0 features/step_definitions/additional_cli_steps.rb
  2. +1 −1 rspec-core.gemspec
  3. +0 −2 spec/spec_helper.rb
@@ -17,6 +17,10 @@
step %q{the exit status should be 0}
end
+Then /^the file "([^"]*)" should contain:$/ do |file, partial_content|
+ check_file_content(file, partial_content, true)
+end
+
Then /^the backtrace\-normalized output should contain:$/ do |partial_output|
# ruby 1.9 includes additional stuff in the backtrace,
# so we need to normalize it to compare it with our expected output.
View
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "rake", "~> 0.9.2"
s.add_development_dependency "cucumber", "~> 1.1.9"
- s.add_development_dependency "aruba", "~> 0.5.0"
+ s.add_development_dependency "aruba", "~> 0.4.11"
s.add_development_dependency "ZenTest", "4.6.2"
s.add_development_dependency "nokogiri", "1.5.2"
View
@@ -17,9 +17,7 @@ def self.each_run
Spork.prefork do
require 'rspec/autorun'
require 'autotest/rspec2'
-
require 'aruba/api'
- require 'aruba/jruby'
if RUBY_PLATFORM == 'java'
# Works around https://jira.codehaus.org/browse/JRUBY-5678

0 comments on commit 351fb0d

Please sign in to comment.