Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'jruby-1_7'
Conflicts: core/src/main/java/org/jruby/RubyTime.java
- Loading branch information
Showing
2 changed files
with
29 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,6 @@ | ||
fails:Time#getlocal returns a Time with UTC offset specified as an Integer number of seconds | ||
fails:Time#getlocal returns a Time with a UTC offset of the specified number of Rational seconds | ||
fails:Time#getlocal raises ArgumentError if the String argument is not in an ASCII-compatible encoding | ||
fails:Time#getlocal raises ArgumentError if the argument represents a value less than or equal to -86400 seconds | ||
fails:Time#getlocal raises ArgumentError if the argument represents a value greater than or equal to 86400 seconds | ||
fails:Time#getlocal with an argument that responds to #to_int coerces using #to_int | ||
fails:Time#getlocal with an argument that responds to #to_r coerces using #to_r | ||
fails:Time#getlocal with an argument that responds to #to_str coerces using #to_str | ||
fails:Time#getlocal raises ArgumentError if the String argument is not in an ASCII-compatible encoding |