ruby-changes:58426
From: Jeremy <ko1@a...>
Date: Fri, 25 Oct 2019 04:35:09 +0900 (JST)
Subject: [ruby-changes:58426] 8c59b9250c (master): Update date specs
https://git.ruby-lang.org/ruby.git/commit/?id=8c59b9250c From 8c59b9250c25c66d6ed16429da139558295a4517 Mon Sep 17 00:00:00 2001 From: Jeremy Evans <code@j...> Date: Thu, 24 Oct 2019 09:35:48 -0700 Subject: Update date specs Allow Date.new spec to run on 2.7. Separate Date.valid_jd? specs, since 2.7 is now stricter and requires numeric value for the first argument. diff --git a/spec/ruby/library/date/parse_spec.rb b/spec/ruby/library/date/parse_spec.rb index 2e800f9..379847a 100644 --- a/spec/ruby/library/date/parse_spec.rb +++ b/spec/ruby/library/date/parse_spec.rb @@ -11,11 +11,9 @@ describe "Date#parse" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/library/date/parse_spec.rb#L11 d.should == Date.commercial(d.cwyear, d.cweek, 5) end - ruby_version_is ''...'2.7' do - it "parses a month name into a Date object" do - d = Date.parse("october") - d.should == Date.civil(Date.today.year, 10) - end + it "parses a month name into a Date object" do + d = Date.parse("october") + d.should == Date.civil(Date.today.year, 10) end it "parses a month day into a Date object" do diff --git a/spec/ruby/library/date/shared/valid_jd.rb b/spec/ruby/library/date/shared/valid_jd.rb index bd71f5a..f6ca3f5 100644 --- a/spec/ruby/library/date/shared/valid_jd.rb +++ b/spec/ruby/library/date/shared/valid_jd.rb @@ -1,7 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/spec/ruby/library/date/shared/valid_jd.rb#L1 describe :date_valid_jd?, shared: true do - it "returns true if passed any value other than nil" do + it "returns true if passed a number value" do Date.send(@method, -100).should be_true - Date.send(@method, :number).should be_true + Date.send(@method, 100.0).should be_true + Date.send(@method, 2**100).should be_true Date.send(@method, Rational(1,2)).should be_true end @@ -9,7 +10,23 @@ describe :date_valid_jd?, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/library/date/shared/valid_jd.rb#L10 Date.send(@method, nil).should be_false end - it "returns true if passed false" do - Date.send(@method, false).should be_true + ruby_version_is ''...'2.7' do + it "returns true if passed symbol" do + Date.send(@method, :number).should be_true + end + + it "returns true if passed false" do + Date.send(@method, false).should be_true + end + end + + ruby_version_is '2.7' do + it "returns false if passed symbol" do + Date.send(@method, :number).should be_false + end + + it "returns false if passed false" do + Date.send(@method, false).should be_false + end end end diff --git a/spec/ruby/library/date/valid_jd_spec.rb b/spec/ruby/library/date/valid_jd_spec.rb index 10c10d7..aecaaab 100644 --- a/spec/ruby/library/date/valid_jd_spec.rb +++ b/spec/ruby/library/date/valid_jd_spec.rb @@ -2,10 +2,8 @@ require_relative '../../spec_helper' https://github.com/ruby/ruby/blob/trunk/spec/ruby/library/date/valid_jd_spec.rb#L2 require_relative 'shared/valid_jd' require 'date' -ruby_version_is ''...'2.7' do - describe "Date.valid_jd?" do +describe "Date.valid_jd?" do - it_behaves_like :date_valid_jd?, :valid_jd? + it_behaves_like :date_valid_jd?, :valid_jd? - end end -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/