]> source.dussan.org Git - redmine.git/commitdiff
fix JRuby 1.6 tests fail on CI server (#12228)
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 28 Oct 2012 03:59:09 +0000 (03:59 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 28 Oct 2012 03:59:09 +0000 (03:59 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10739 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

diff --git a/Gemfile b/Gemfile
index f0ec5262df2c86318d3aab5708d97d49ab040c99..80ba78a8e2e868a8cb95b305984e585c4e61d492 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,9 @@ group :test do
   gem "shoulda", "~> 2.11"
   # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7.
   # It seems to need test-unit explicitely.
-  gem "test-unit", :platforms => [:mri_19, :jruby]
+  platforms = [:mri_19]
+  platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7"
+  gem "test-unit", :platforms => platforms
   gem "mocha", "0.12.3"
 end