Author: toulmean
Date: Sat Jul 17 18:17:23 2010
New Revision: 965120
URL: http://svn.apache.org/viewvc?rev=965120&view=rev
Log:
Better spec to check the JRUBY_VERSION (BUILDR-479)
Modified:
buildr/trunk/spec/java/java_spec.rb
Modified: buildr/trunk/spec/java/java_spec.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/spec/java/java_spec.rb?rev=965120&r1=965119&r2=965120&view=diff
==============================================================================
--- buildr/trunk/spec/java/java_spec.rb (original)
+++ buildr/trunk/spec/java/java_spec.rb Sat Jul 17 18:17:23 2010
@@ -44,14 +44,9 @@ unless RUBY_PLATFORM =~ /java/
else
describe 'JRuby environment' do
it 'should enforce a minimum version of jruby' do
- jruby_version = JRUBY_VERSION
- begin
- JRUBY_VERSION = '-1'
- lambda { load File.expand_path('../lib/buildr/java/jruby.rb')
}.should raise(/JRuby must be at least at version .*/)
- ensure
- JRUBY_VERSION = jruby_version
- end
-
+ check
=File.read(File.expand_path('../lib/buildr/java/jruby.rb')).match(/JRUBY_MIN_VERSION.*\n.*JRUBY_MIN_VERSION\n/).to_s
+ check.sub!('JRUBY_VERSION', "'0.0.0'")
+ lambda { eval(check) }.should raise_error(/JRuby must be at least at
version /)
end
end
end
