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

Commits on Jan 29, 2016

  1. --color spec:regression by default ... --no-color to disable

    @kares
    kares committed Jan 29, 2016
    Copy the full SHA
    2e67f0b View commit details

  2. and --color it is

    @kares
    kares committed Jan 29, 2016
    Copy the full SHA
    68bf815 View commit details

  3. revert back to JRuby specific changes in date/format.rb (wiped out wi… 

    …th stdlib update)

... this resolves the last spec:regression (GH-2883)
    @kares
    kares committed Jan 29, 2016
    Copy the full SHA
    a49887f View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 lib/ruby/stdlib/date/format.rb
  2. +1 −1 rakelib/rspec.rake
  3. +1 −1 spec/java_integration/spec.opts
  4. +1 −1 spec/java_integration/spec.quiet.opts
6 changes: 3 additions & 3 deletions lib/ruby/stdlib/date/format.rb
View file
Original file line number Diff line number Diff line change
@@ -939,7 +939,7 @@ def self._iso8601(str) # :nodoc:
h[:sec] = i sec if sec
end

h[:sec_fraction] = sec_fraction if sec_fraction
h[:sec_fraction] = Rational(sec_fraction.to_i, 10**sec_fraction.size) if sec_fraction # JRuby bug fix!
set_zone(h, zone)

elsif /\A\s*
@@ -981,7 +981,7 @@ def self._iso8601(str) # :nodoc:
h[:sec] = i sec if sec
end

h[:sec_fraction] = sec_fraction if sec_fraction
h[:sec_fraction] = Rational(sec_fraction.to_i, 10**sec_fraction.size) if sec_fraction # JRuby bug fix!
set_zone(h, zone)

elsif /\A\s*
@@ -1004,7 +1004,7 @@ def self._iso8601(str) # :nodoc:
h[:hour] = i hour
h[:min] = i min
h[:sec] = i sec if sec
h[:sec_fraction] = i sec_fraction if sec_fraction
h[:sec_fraction] = Rational(sec_fraction.to_i, 10**sec_fraction.size) if sec_fraction # JRuby bug fix!
set_zone(h, zone)
end
h
2 changes: 1 addition & 1 deletion rakelib/rspec.rake
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ namespace :spec do

permute_specs "regression", compile_flags do |t|
t.rspec_opts ||= []
t.rspec_opts << '--format documentation '
t.rspec_opts << '--color --format documentation '
t.pattern = 'spec/regression/**/*_spec.rb'
end

2 changes: 1 addition & 1 deletion spec/java_integration/spec.opts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--colour
--color
--format
documentation
--backtrace
2 changes: 1 addition & 1 deletion spec/java_integration/spec.quiet.opts
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
--colour
--color
--backtrace