Skip to content

Commit 482b1d7

Browse files
authored
Merge pull request #2842 from ruby/fix-typecheck-test
Use unreleased steep for `rake typecheck_test`
2 parents 36ba133 + 3eddb71 commit 482b1d7

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ group :minitest do
5656
end
5757

5858
group :typecheck_test do
59-
gem "steep", require: false
59+
gem "steep", require: false, git: "https://github.com/soutaro/steep.git"
6060
end

Gemfile.lock

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
GIT
2+
remote: https://github.com/soutaro/steep.git
3+
revision: daa249e47ff4d1d197d3b6d2d73400db32293250
4+
specs:
5+
steep (2.0.0.dev)
6+
activesupport (>= 5.1)
7+
concurrent-ruby (>= 1.1.10)
8+
csv (>= 3.0.9)
9+
fileutils (>= 1.1.0)
10+
json (>= 2.1.0)
11+
language_server-protocol (>= 3.17.0.4, < 4.0)
12+
listen (~> 3.0)
13+
logger (>= 1.3.0)
14+
mutex_m (>= 0.3.0)
15+
parser (>= 3.2)
16+
rainbow (>= 2.2.2, < 4.0)
17+
rbs (~> 4.0.0.dev)
18+
securerandom (>= 0.1)
19+
strscan (>= 1.0.0)
20+
terminal-table (>= 2, < 5)
21+
uri (>= 0.12.0)
22+
123
PATH
224
remote: .
325
specs:
@@ -155,23 +177,6 @@ GEM
155177
nokogiri
156178
securerandom (0.4.1)
157179
stackprof (0.2.27)
158-
steep (1.10.0)
159-
activesupport (>= 5.1)
160-
concurrent-ruby (>= 1.1.10)
161-
csv (>= 3.0.9)
162-
fileutils (>= 1.1.0)
163-
json (>= 2.1.0)
164-
language_server-protocol (>= 3.17.0.4, < 4.0)
165-
listen (~> 3.0)
166-
logger (>= 1.3.0)
167-
mutex_m (>= 0.3.0)
168-
parser (>= 3.1)
169-
rainbow (>= 2.2.2, < 4.0)
170-
rbs (~> 3.9)
171-
securerandom (>= 0.1)
172-
strscan (>= 1.0.0)
173-
terminal-table (>= 2, < 5)
174-
uri (>= 0.12.0)
175180
stringio (3.2.0)
176181
strong_json (2.1.2)
177182
strscan (3.1.7)
@@ -228,7 +233,7 @@ DEPENDENCIES
228233
rubocop-rubycw
229234
ruby_memcheck
230235
stackprof
231-
steep
236+
steep!
232237
tempfile
233238
test-unit
234239

Rakefile

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -246,21 +246,16 @@ task :stdlib_test => :compile do
246246
end
247247

248248
task :typecheck_test => :compile do
249-
puts
250-
puts
251-
puts "⛔️⛔️⛔️⛔️⛔️⛔️ Skipping type check test because RBS is incompatible with Steep (#{__FILE__}:#{__LINE__})"
252-
puts
253-
puts
254-
# FileList["test/typecheck/*"].each do |test|
255-
# Dir.chdir(test) do
256-
# expectations = File.join(test, "steep_expectations.yml")
257-
# if File.exist?(expectations)
258-
# sh "steep check --with_expectations"
259-
# else
260-
# sh "steep check"
261-
# end
262-
# end
263-
# end
249+
FileList["test/typecheck/*"].each do |test|
250+
Dir.chdir(test) do
251+
expectations = File.join(test, "steep_expectations.yml")
252+
if File.exist?(expectations)
253+
sh "steep check --with_expectations"
254+
else
255+
sh "steep check"
256+
end
257+
end
258+
end
264259
end
265260

266261
task :raap => :compile do

0 commit comments

Comments
 (0)