summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-10-28 03:59:09 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-10-28 03:59:09 +0000
commita71ff93f8f753ac1b5b9374a8868cf839572f70c (patch)
tree0fa0df68afb1a7024e886c972a72b8fdab628f3a /Gemfile
parent49f2d4729d1726e83483f97672bb80d69cbcf6af (diff)
downloadredmine-a71ff93f8f753ac1b5b9374a8868cf839572f70c.tar.gz
redmine-a71ff93f8f753ac1b5b9374a8868cf839572f70c.zip
fix JRuby 1.6 tests fail on CI server (#12228)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10739 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f0ec5262d..80ba78a8e 100644
--- 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