aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2020-07-23 17:30:26 +0900
committernagachika <nagachika@ruby-lang.org>2020-07-23 17:30:26 +0900
commit4437f9eb0bf8369bcf12bd7cd324e11b5d885e07 (patch)
tree0e69bf4130e9613a023317e09ab7f753f73dfa36
parentc53cee7a0e7b3e87ba3fbafa86bd74460af18d93 (diff)
downloadruby-4437f9eb0bf8369bcf12bd7cd324e11b5d885e07.tar.gz
merge revision(s) da05c1552ee519d8f180b48d97148d28501acb35: [Backport #16749]
Update to ruby/spec@cc7b9e5
-rw-r--r--spec/ruby/README.md1
-rw-r--r--spec/ruby/core/file/lchmod_spec.rb10
-rw-r--r--version.h2
3 files changed, 5 insertions, 8 deletions
diff --git a/spec/ruby/README.md b/spec/ruby/README.md
index 3163a78902..c1316a9246 100644
--- a/spec/ruby/README.md
+++ b/spec/ruby/README.md
@@ -50,6 +50,7 @@ For older specs try these commits:
* Ruby 2.1.9 - [Suite](https://github.com/ruby/spec/commit/f029e65241374386077ac500add557ae65069b55) using [MSpec](https://github.com/ruby/mspec/commit/55568ea3918c6380e64db8c567d732fa5781efed)
* Ruby 2.2.10 - [Suite](https://github.com/ruby/spec/commit/cbaa0e412270c944df0c2532fc500c920dba0e92) using [MSpec](https://github.com/ruby/mspec/commit/d84d7668449e96856c5f6bac8cb1526b6d357ce3)
* Ruby 2.3.8 - [Suite](https://github.com/ruby/spec/commit/dc733114d8ae66a3368ba3a98422c50147a76ba5) using [MSpec](https://github.com/ruby/mspec/commit/4599bc195fb109f2a482a01c32a7d659518369ea)
+* Ruby 2.4.10 - [Suite](https://github.com/ruby/spec/commit/bce4f2b81d6c31db67cf4d023a0625ceadde59bd) using [MSpec](https://github.com/ruby/mspec/commit/e7eb8aa4c26495b7b461e687d950b96eb08b3ff2)
### Running the specs
diff --git a/spec/ruby/core/file/lchmod_spec.rb b/spec/ruby/core/file/lchmod_spec.rb
index 9490459a02..6a28bdc16d 100644
--- a/spec/ruby/core/file/lchmod_spec.rb
+++ b/spec/ruby/core/file/lchmod_spec.rb
@@ -1,7 +1,7 @@
require_relative '../../spec_helper'
describe "File.lchmod" do
- platform_is_not :linux, :windows, :openbsd, :solaris, :aix do
+ guard -> { File.respond_to?(:lchmod) } do
before :each do
@fname = tmp('file_chmod_test')
@lname = @fname + '.lnk'
@@ -30,13 +30,9 @@ describe "File.lchmod" do
end
end
- platform_is :linux, :openbsd, :aix do
- it "returns false from #respond_to?" do
- File.respond_to?(:lchmod).should be_false
- end
-
+ guard_not -> { File.respond_to?(:lchmod) } do
it "raises a NotImplementedError when called" do
- -> { File.lchmod 0 }.should raise_error(NotImplementedError)
+ -> { File.lchmod 0, "foo" }.should raise_error(NotImplementedError)
end
end
end
diff --git a/version.h b/version.h
index 8cb4ea4acf..a0b6e42104 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 105
+#define RUBY_PATCHLEVEL 106
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 7