From a9d01451154995878342576f0dd745fe496eb69e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 9 Nov 2023 21:45:57 +0900 Subject: [PATCH] Revert "Skip TypeCompletion test in ruby ci (#748)" (#755) This reverts commit d394af0bbce4570ebc2a38344132ab47ba4f73d2. --- .github/workflows/test.yml | 4 ++-- test/irb/test_context.rb | 1 - test/irb/type_completion/test_scope.rb | 2 -- test/irb/type_completion/test_type_analyze.rb | 2 -- test/irb/type_completion/test_type_completor.rb | 2 -- test/irb/type_completion/test_types.rb | 2 -- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a77258e04..bb493c442 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,9 +35,9 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Run tests - run: WITH_TYPE_COMPLETION_TEST=1 bundle exec rake test + run: bundle exec rake test - name: Run tests in isolation - run: WITH_TYPE_COMPLETION_TEST=1 bundle exec rake test_in_isolation + run: bundle exec rake test_in_isolation vterm-yamatanooroti: needs: ruby-versions name: >- diff --git a/test/irb/test_context.rb b/test/irb/test_context.rb index f30ff36d4..ce57df6cd 100644 --- a/test/irb/test_context.rb +++ b/test/irb/test_context.rb @@ -653,7 +653,6 @@ def test_lineno end def test_build_completor - pend 'set ENV["WITH_TYPE_COMPLETION_TEST"] to run this test' unless ENV['WITH_TYPE_COMPLETION_TEST'] verbose, $VERBOSE = $VERBOSE, nil original_completor = IRB.conf[:COMPLETOR] IRB.conf[:COMPLETOR] = :regexp diff --git a/test/irb/type_completion/test_scope.rb b/test/irb/type_completion/test_scope.rb index 4eb019478..d7f9540b0 100644 --- a/test/irb/type_completion/test_scope.rb +++ b/test/irb/type_completion/test_scope.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -return unless ENV['WITH_TYPE_COMPLETION_TEST'] - return unless RUBY_VERSION >= '3.0.0' return if RUBY_ENGINE == 'truffleruby' # needs endless method definition diff --git a/test/irb/type_completion/test_type_analyze.rb b/test/irb/type_completion/test_type_analyze.rb index 1c1ea94c2..c417a8ad1 100644 --- a/test/irb/type_completion/test_type_analyze.rb +++ b/test/irb/type_completion/test_type_analyze.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -return unless ENV['WITH_TYPE_COMPLETION_TEST'] - # Run test only when Ruby >= 3.0 and %w[prism rbs] are available return unless RUBY_VERSION >= '3.0.0' return if RUBY_ENGINE == 'truffleruby' # needs endless method definition diff --git a/test/irb/type_completion/test_type_completor.rb b/test/irb/type_completion/test_type_completor.rb index 7ae1ada79..eed400b3e 100644 --- a/test/irb/type_completion/test_type_completor.rb +++ b/test/irb/type_completion/test_type_completor.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -return unless ENV['WITH_TYPE_COMPLETION_TEST'] - # Run test only when Ruby >= 3.0 and %w[prism rbs] are available return unless RUBY_VERSION >= '3.0.0' return if RUBY_ENGINE == 'truffleruby' # needs endless method definition diff --git a/test/irb/type_completion/test_types.rb b/test/irb/type_completion/test_types.rb index 93c58be17..7698bd2fc 100644 --- a/test/irb/type_completion/test_types.rb +++ b/test/irb/type_completion/test_types.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -return unless ENV['WITH_TYPE_COMPLETION_TEST'] - return unless RUBY_VERSION >= '3.0.0' return if RUBY_ENGINE == 'truffleruby' # needs endless method definition