Skip to content

Commit 38c4a5a

Browse files
authored
Merge pull request #2487 from ruby/fix-supers-3.9
Add `super` calls in `#setup` (3.9)
2 parents ee913ff + c33ce1d commit 38c4a5a

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

.github/workflows/ruby.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ jobs:
4444
bundler: none
4545
- name: Set working directory as safe
4646
run: git config --global --add safe.directory $(pwd)
47-
- name: Set up permission
48-
run: chmod -R o-w /opt/hostedtoolcache/Ruby
4947
- name: Install dependencies
5048
run: |
5149
sudo apt-get update
@@ -90,8 +88,6 @@ jobs:
9088
bundler-cache: none
9189
- name: Set working directory as safe
9290
run: git config --global --add safe.directory $(pwd)
93-
- name: Set up permission
94-
run: chmod -R o-w /opt/hostedtoolcache/Ruby
9591
- name: Install dependencies
9692
run: |
9793
sudo apt-get update

.github/workflows/typecheck.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
bundler: none
2121
- name: Set working directory as safe
2222
run: git config --global --add safe.directory $(pwd)
23-
- name: Set up permission
24-
run: chmod -R o-w /opt/hostedtoolcache/Ruby
2523
- name: Install dependencies
2624
run: |
2725
sudo apt-get update

test/stdlib/CGI_test.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ class CGITest < Test::Unit::TestCase
6868
testing "::CGI"
6969

7070
def setup
71+
super
7172
ARGV.replace(%w(abc=001 def=002))
7273
end
7374

test/stdlib/Forwardable_test.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class SingleForwardableTest < Test::Unit::TestCase
7171
testing "::SingleForwardable"
7272

7373
def setup
74+
super
7475
@tested = Object.new
7576
@tested.extend SingleForwardable
7677
end

test/stdlib/Minitest_test.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ class MinitestTestLifecycleHooksTest < Test::Unit::TestCase
5151

5252
class LifecycleSetup < Minitest::Test
5353
def setup
54+
super
5455
@foo = 123
5556
end
56-
end
57+
end
5758

5859
def test_setup_return_type_void
5960
test = LifecycleSetup.new("setup")

test/stdlib/Ractor_test.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ class RactorInstanceTest < Test::Unit::TestCase
132132
testing "::Ractor"
133133

134134
def test_aref
135+
omit "Accessing ractor local storage" if RUBY_VERSION >= "3.5"
136+
135137
r = Ractor.new {}
136138
r['foo'] = 'bar'
137139
assert_send_type "(String) -> untyped",
@@ -141,6 +143,8 @@ def test_aref
141143
end
142144

143145
def test_aset
146+
omit "Accessing ractor local storage" if RUBY_VERSION >= "3.5"
147+
144148
r = Ractor.new {}
145149
assert_send_type "(String, String) -> String",
146150
r, :[]=, 'foo', 'bar'

test/stdlib/uri/rfc2396_parser_test.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class URIRFC2396_ParserInstanceTest < Test::Unit::TestCase
2020
testing "::URI::RFC2396_Parser"
2121

2222
def setup
23+
super
2324
@instance = URI::RFC2396_Parser.new
2425
end
2526

0 commit comments

Comments
 (0)