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: 9dcc637ffa22
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4d82e399fe48
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 31, 2014

  1. Apply psych/test_emitter.rb change from MRI.

    @headius
    headius committed Oct 31, 2014
    Copy the full SHA
    6a3b991 View commit details

  2. Update to Snakeyaml 1.14.

    @headius
    headius committed Oct 31, 2014
    Copy the full SHA
    688a71b View commit details

Commits on Nov 2, 2014

  1. Exclude test due to SnakeYAML behavior.

    @headius
    headius committed Nov 2, 2014
    Copy the full SHA
    4d82e39 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 core/pom.rb
  2. +1 −1 core/pom.xml
  3. +1 −0 test/mri/excludes/Psych/Handlers/TestRecorder.rb
  4. +1 −2 test/mri/psych/test_emitter.rb
2 changes: 1 addition & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@
jar 'junit:junit', :scope => 'test'
jar 'org.apache.ant:ant:${ant.version}', :scope => 'provided'
jar 'org.osgi:org.osgi.core:5.0.0', :scope => 'provided'
jar 'org.yaml:snakeyaml:1.13'
jar 'org.yaml:snakeyaml:1.14'

# joda timezone must be before joda-time to be packed correctly
jar 'org.jruby:joda-timezones:${tzdata.version}', :scope => '${tzdata.scope}'
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -189,7 +189,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.13</version>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
1 change: 1 addition & 0 deletions test/mri/excludes/Psych/Handlers/TestRecorder.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude :test_replay, "SnakeYAML always sends default tags to implicit document start"
3 changes: 1 addition & 2 deletions test/mri/psych/test_emitter.rb
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,7 @@ def setup
end

def test_line_width
assert_equal 0, @emitter.line_width
assert_equal 10, @emitter.line_width = 10
@emitter.line_width = 10
assert_equal 10, @emitter.line_width
end