Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 861f0c26c53b
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d6a583dc29bc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 24, 2015

  1. Resolves broken spec when ANT_HOME is set 

    The changes in 55f56c9 were not equivalent. Le sigh.
    @benlovell
    benlovell committed Aug 24, 2015
    Copy the full SHA
    014c73a View commit details

Commits on Aug 25, 2015

  1. Merge pull request #3281 from benlovell/fix-ant-spec 

    Resolves broken spec when `ANT_HOME` is set
    @kares
    kares committed Aug 25, 2015
    Copy the full SHA
    d6a583d View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 spec/java_integration/ant/ant_spec.rb
2 changes: 1 addition & 1 deletion spec/java_integration/ant/ant_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -135,7 +135,7 @@ def stub_File!
if ENV['ANT_HOME']
hide_ant_from_path
expect { Ant.ant(:basedir => File.join(File.dirname(__FILE__), '..', '..', '..')) }.
to raise_error
to_not raise_error
else
skip '$ANT_HOME is not set'
end