Skip to content

Commit

Permalink
Add JRuby to travis. Minor spec fixes for JRuby compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
cheald committed Jul 7, 2013
1 parent f205649 commit ec08319
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
17 changes: 15 additions & 2 deletions .travis.yml
@@ -1,9 +1,9 @@
language: ruby
gemfile:
- Gemfile
- gemfiles/rails3_0.gemfile
- gemfiles/rails3_1.gemfile
- gemfiles/rails3_2.gemfile
- gemfiles/rails4_0.gemfile
language: ruby
rvm:
- 1.8.7
- 1.9.3
Expand All @@ -16,3 +16,16 @@ matrix:
exclude:
- rvm: 1.8.7
gemfile: gemfiles/rails4_0.gemfile
include:
- rvm: jruby-19mode
gemfile: gemfiles/rails3_0.gemfile
env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
- rvm: jruby-19mode
gemfile: gemfiles/rails3_1.gemfile
env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
- rvm: jruby-19mode
gemfile: gemfiles/rails3_2.gemfile
env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
- rvm: jruby-19mode
gemfile: gemfiles/rails4_0.gemfile
env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
2 changes: 1 addition & 1 deletion spec/unit/extensions_spec.rb
Expand Up @@ -307,7 +307,7 @@

it "should be time to milliseconds if string" do
Time.zone = 'Hawaii'
Time.to_mongo('2009-08-15 14:00:00.123456').to_f.should be_within(0.0000001).of(Time.utc(2009, 8, 16, 0, 0, 0, 123456).to_f)
Time.to_mongo('2009-08-15 14:00:00.123000').to_f.should be_within(0.0000001).of(Time.utc(2009, 8, 16, 0, 0, 0, 123000).to_f)
Time.zone = nil
end

Expand Down
7 changes: 4 additions & 3 deletions spec/unit/model_generator_spec.rb
Expand Up @@ -9,12 +9,13 @@

before do
prepare_destination
# run_generator
end

it 'help shows MongoMapper options' do
content = run_generator ['--help']
assert_match(/rails generate mongo_mapper:model/, content)
pending "Rails 4 breaks Kernel#capture on JRuby", :if => (Rails::VERSION::MAJOR >= 4 && RUBY_PLATFORM == "java") do
content = run_generator ['--help']
assert_match(/rails generate mongo_mapper:model/, content)
end
end

it 'model are properly created' do
Expand Down

0 comments on commit ec08319

Please sign in to comment.