Permalink
Browse files

Change JRuby CI matrix to jruby-19mode. refs #1078

  • Loading branch information...
1 parent e17434d commit 9bfa8c90f6a1d8ad2fd2020de773641417bc12f7 @mshibuya mshibuya committed Apr 15, 2012
View
@@ -1,6 +1,6 @@
bundler_args: "--without debug"
rvm:
- - jruby-18mode
+ - jruby-19mode
- 1.8.7
- 1.9.3
env:
@@ -12,11 +12,11 @@ env:
language: ruby
matrix:
exclude:
- - rvm: jruby-18mode
+ - rvm: jruby-19mode
env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
- - rvm: jruby-18mode
+ - rvm: jruby-19mode
env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
- - rvm: jruby-18mode
+ - rvm: jruby-19mode
env: "CI_ORM=mongoid CI_ORM_VERSION=head"
- rvm: 1.8.7
env: "CI_ORM=mongoid CI_ORM_VERSION=head"
View
@@ -32,7 +32,7 @@ group :active_record do
end
group :mongoid do
- gem 'bson_ext'
+ gem 'bson_ext', :platforms => [:ruby, :mswin, :mingw]
case ENV['CI_ORM_VERSION']
when 'head'
gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
@@ -67,6 +67,7 @@ end
group :development, :test do
gem 'cancan'
+ gem 'devise'
gem 'paperclip', '~> 2.7'
end
View
@@ -34,7 +34,7 @@ group :active_record do
end
group :mongoid do
- gem 'bson_ext'
+ gem 'bson_ext', :platforms => [:ruby, :mswin, :mingw]
case ENV['CI_ORM_VERSION']
when 'head'
gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
@@ -10,8 +10,6 @@
rescue LoadError
end
-require 'devise'
-
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
# Bundler.require(*Rails.groups(:assets => %w(development test)))
@@ -6,4 +6,4 @@
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) && !ENV['TRAVIS']
@@ -59,8 +59,8 @@
csv.flatten.should include(@player.team.name)
csv.flatten.should include(@player.draft.college)
- should have_content @player.comments.first.content.split("\n").first.strip # can't match for more than one line
- should have_content @player.comments.second.content.split("\n").first.strip
+ csv.flatten.join(' ').should include(@player.comments.first.content.split("\n").first.strip)
+ csv.flatten.join(' ').should include(@player.comments.second.content.split("\n").first.strip)
end
it "should allow to export to JSON" do

0 comments on commit 9bfa8c9

Please sign in to comment.