.travis.yml config to enable jruby cext

robertodecurnex · robertodecurnex · commit 24b556958a20 · 2013-04-11T17:07:51.000-03:00
Minor changes for ruby 1.9 compatibility (closes ruby-git#35)
diff --git a/.travis.yml b/.travis.yml
@@ -9,3 +9,13 @@ rvm:
   - jruby-head
   - ree
   - ruby-head
+matrix:
+  - rvm: jruby-18mode
+    env:
+      - JRUBY_OPTS="-Xcext.enable=true"
+  - rvm: jruby-19mode
+    env:
+      - JRUBY_OPTS="-Xcext.enable=true"
+  - rvm: jruby-head
+    env:
+      - JRUBY_OPTS="-Xcext.enable=true"
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -322,7 +322,7 @@ def config_remote(name)
     end
 
     def config_get(name)
-      do_get = lambda do
+      do_get = lambda do |path|
         command('config', ['--get', name])
       end
 
diff --git a/tests/all_tests.rb b/tests/all_tests.rb
@@ -1,4 +1,5 @@
 Dir.chdir(File.dirname(__FILE__)) do
-  Dir.glob('**/test_*.rb') { |test_case| require test_case }
-  #Dir.glob('**/test_index.rb') { |test_case| require test_case }
+  Dir.glob('**/test_*.rb') do |test_case| 
+    require "#{File.expand_path(File.dirname(__FILE__))}/#{test_case}" 
+  end
 end
diff --git a/tests/test_helper.rb b/tests/test_helper.rb
@@ -1,7 +1,7 @@
+require 'date'
 require 'fileutils'
 require 'logger'
 require 'test/unit'
-require 'ruby-debug'
 
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/git"
 
diff --git a/tests/units/test_diff.rb b/tests/units/test_diff.rb
@@ -34,7 +34,7 @@ def test_diff_path
   
   def test_diff_objects
     d = @git.diff('gitsearch1', @git.gtree('v2.5'))
-    assert(3, d.size)
+    assert_equal(3, d.size)
   end
   
   def test_object_diff
