aboutsummaryrefslogtreecommitdiffstats
path: root/spec/ruby/shared
diff options
context:
space:
mode:
authorBenoit Daloze <eregontp@gmail.com>2019-04-28 23:20:11 +0200
committerBenoit Daloze <eregontp@gmail.com>2019-04-28 23:20:11 +0200
commit79671ec57e59091260a0bc3d40a31d31d9c72a94 (patch)
tree2f59a8727b8f63f9e79d50352fa4f78a7cc00234 /spec/ruby/shared
parent994833085ae06afbe94d30ab183d80e0234fbe14 (diff)
downloadruby-79671ec57e59091260a0bc3d40a31d31d9c72a94.tar.gz
Update to ruby/spec@7de852d
Diffstat (limited to 'spec/ruby/shared')
-rw-r--r--spec/ruby/shared/string/times.rb10
-rw-r--r--spec/ruby/shared/time/strftime_for_date.rb10
2 files changed, 8 insertions, 12 deletions
diff --git a/spec/ruby/shared/string/times.rb b/spec/ruby/shared/string/times.rb
index c44a76c9b7..e7b788d4f9 100644
--- a/spec/ruby/shared/string/times.rb
+++ b/spec/ruby/shared/string/times.rb
@@ -42,12 +42,10 @@ describe :string_times, shared: true do
end
end
- with_feature :encoding do
- it "returns a String in the same encoding as self" do
- str = "\xE3\x81\x82".force_encoding Encoding::UTF_8
- result = @object.call(str, 2)
- result.encoding.should equal(Encoding::UTF_8)
- end
+ it "returns a String in the same encoding as self" do
+ str = "\xE3\x81\x82".force_encoding Encoding::UTF_8
+ result = @object.call(str, 2)
+ result.encoding.should equal(Encoding::UTF_8)
end
platform_is wordsize: 32 do
diff --git a/spec/ruby/shared/time/strftime_for_date.rb b/spec/ruby/shared/time/strftime_for_date.rb
index f126c5a323..dbb124adc8 100644
--- a/spec/ruby/shared/time/strftime_for_date.rb
+++ b/spec/ruby/shared/time/strftime_for_date.rb
@@ -264,12 +264,10 @@ describe :strftime_date, shared: true do
@new_date[2001,3,22].strftime("%-m/%-d/%-y").should == "3/22/1"
end
- with_feature :encoding do
- it "passes the format string's encoding to the result string" do
- result = @new_date[2010,3,8].strftime("%d. März %Y")
+ it "passes the format string's encoding to the result string" do
+ result = @new_date[2010,3,8].strftime("%d. März %Y")
- result.encoding.should == Encoding::UTF_8
- result.should == "08. März 2010"
- end
+ result.encoding.should == Encoding::UTF_8
+ result.should == "08. März 2010"
end
end