Skip to content

Commit fd29c20

Browse files
committed
Date before 3.1.3 does not have version, such as in CRuby 3.0.2
* CRuby 3.0.2 ships with Date 3.1.0 * CRuby 3.0.3 ships with Date 3.1.3
1 parent d028c39 commit fd29c20

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

spec/ruby/library/date/deconstruct_keys_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
require_relative '../../spec_helper'
22
require 'date'
3+
date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
34

4-
version_is Date::VERSION, "3.3" do #ruby_version_is "3.2" do
5+
version_is date_version, "3.3" do #ruby_version_is "3.2" do
56
describe "Date#deconstruct_keys" do
67
it "returns whole hash for nil as an argument" do
78
d = Date.new(2022, 10, 5)

spec/ruby/library/date/strftime_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require_relative "../../spec_helper"
22
require 'date'
33
require_relative '../../shared/time/strftime_for_date'
4+
date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
45

56
describe "Date#strftime" do
67
before :all do
@@ -23,14 +24,14 @@
2324
end
2425

2526
# %v is %e-%b-%Y for Date/DateTime
26-
version_is Date::VERSION, ""..."3.2" do #ruby_version_is ""..."3.1" do
27+
version_is date_version, ""..."3.2" do #ruby_version_is ""..."3.1" do
2728
it "should be able to show the commercial week" do
2829
@date.strftime("%v").should == " 9-Apr-2000"
2930
@date.strftime("%v").should == @date.strftime('%e-%b-%Y')
3031
end
3132
end
3233

33-
version_is Date::VERSION, "3.2" do #ruby_version_is "3.1" do
34+
version_is date_version, "3.2" do #ruby_version_is "3.1" do
3435
it "should be able to show the commercial week" do
3536
@date.strftime("%v").should == " 9-APR-2000"
3637
@date.strftime("%v").should != @date.strftime('%e-%b-%Y')

spec/ruby/library/datetime/deconstruct_keys_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
require_relative '../../spec_helper'
22
require 'date'
3+
date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
34

4-
version_is Date::VERSION, "3.3" do #ruby_version_is "3.2" do
5+
version_is date_version, "3.3" do #ruby_version_is "3.2" do
56
describe "DateTime#deconstruct_keys" do
67
it "returns whole hash for nil as an argument" do
78
d = DateTime.new(2022, 10, 5, 13, 30)

spec/ruby/library/datetime/strftime_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
require 'date'
33
require_relative '../../shared/time/strftime_for_date'
44
require_relative '../../shared/time/strftime_for_time'
5+
date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
56

67
describe "DateTime#strftime" do
78
before :all do
@@ -33,14 +34,14 @@
3334
end
3435

3536
# %v is %e-%b-%Y for Date/DateTime
36-
version_is Date::VERSION, ""..."3.2" do #ruby_version_is ""..."3.1" do
37+
version_is date_version, ""..."3.2" do #ruby_version_is ""..."3.1" do
3738
it "should be able to show the commercial week" do
3839
@time.strftime("%v").should == " 3-Feb-2001"
3940
@time.strftime("%v").should == @time.strftime('%e-%b-%Y')
4041
end
4142
end
4243

43-
version_is Date::VERSION, "3.2" do #ruby_version_is "3.1" do
44+
version_is date_version, "3.2" do #ruby_version_is "3.1" do
4445
it "should be able to show the commercial week" do
4546
@time.strftime("%v").should == " 3-FEB-2001"
4647
@time.strftime("%v").should != @time.strftime('%e-%b-%Y')

spec/ruby/library/datetime/to_time_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require_relative '../../spec_helper'
22
require 'date'
3+
date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
34

45
describe "DateTime#to_time" do
56
it "yields a new Time object" do
@@ -18,7 +19,7 @@
1819
time.sec.should == 59
1920
end
2021

21-
version_is(Date::VERSION, '3.2.3') do #ruby_version_is "3.2" do
22+
version_is date_version, '3.2.3' do #ruby_version_is "3.2" do
2223
it "returns a Time representing the same instant before Gregorian" do
2324
datetime = DateTime.civil(1582, 10, 4, 23, 58, 59)
2425
time = datetime.to_time.utc

spec/ruby/library/time/to_datetime_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
require_relative '../../spec_helper'
22
require 'time'
3+
require 'date'
4+
date_version = defined?(Date::VERSION) ? Date::VERSION : '3.1.0'
35

46
describe "Time#to_datetime" do
57
it "returns a DateTime representing the same instant" do
@@ -13,7 +15,7 @@
1315
datetime.sec.should == 59
1416
end
1517

16-
version_is(Date::VERSION, '3.2.3') do #ruby_version_is '3.2' do
18+
version_is date_version, '3.2.3' do #ruby_version_is '3.2' do
1719
it "returns a DateTime representing the same instant before Gregorian" do
1820
time = Time.utc(1582, 10, 14, 23, 58, 59)
1921
datetime = time.to_datetime

0 commit comments

Comments
 (0)