Use the latest IRuby kernel in tests

Author: mrkn

test/helper.rb

@@ -2,6 +2,7 @@
 require "json"
 require 'multi_json'
 require "pathname"
+require "rbconfig"
 require "test/unit"
 require "test/unit/rr"
 require "tmpdir"
@@ -11,9 +12,28 @@
 
 module IRubyTest
   class TestBase < Test::Unit::TestCase
+    TEST_DIR = File.expand_path("..", __FILE__).freeze
+    BIN_DIR = File.expand_path("../bin", TEST_DIR).freeze
+    LIB_DIR = File.expand_path("../lib", TEST_DIR).freeze
+
+    RUBY = RbConfig.ruby.freeze
+    IRUBY_PATH = File.join(BIN_DIR, "iruby").freeze
+
+    def iruby_command(*args)
+      [RUBY, "-I#{LIB_DIR}", IRUBY_PATH, *args]
+    end
+
     def self.startup
-      @__config_dir = Dir.mktmpdir("iruby-test")
+      @__work_dir = Dir.mktmpdir("iruby-test-data")
+
+      @__jupyter_data_dir = File.join(@__work_dir, "jupyter")
+      ENV["JUPYTER_DATA_DIR"] = @__jupyter_data_dir
+      system(RUBY, "-I#{LIB_DIR}", IRUBY_PATH, "register",
+             err: :out, out: File::NULL)
+
+      @__config_dir = File.join(@__work_dir, "config")
       @__config_path = Pathname.new(@__config_dir) + "config.json"
+      @__config_path.dirname.mkpath
       File.write(@__config_path, {
         control_port: 50160,
         shell_port: 57503,
@@ -30,7 +50,7 @@ def self.startup
     end
 
     def self.shutdown
-      FileUtils.remove_entry_secure(@__config_dir)
+      FileUtils.remove_entry_secure(@__work_dir)
     end
 
     def self.test_config_filename

test/iruby/command_test.rb

@@ -150,7 +150,9 @@ def test_register_and_unregister_with_JUPYTER_DATA_DIR
     def test_register_and_unregister_with_JUPYTER_DATA_DIR_when_there_is_kernel_in_ipython_dir
       Dir.mktmpdir do |tmpdir|
         Dir.mktmpdir do |tmpdir2|
-          with_env('HOME' => tmpdir2) do
+          with_env("JUPYTER_DATA_DIR" => nil,
+                   "IPYTHONDIR" => nil,
+                   "HOME" => tmpdir2) do
             ignore_warning do
               @command = IRuby::Command.new(["register", "--ipython-dir=~/.ipython"])
               assert_equal("#{tmpdir2}/.ipython/kernels/ruby/kernel.json", @command.kernel_file)

test/iruby/jupyter_test.rb

@@ -2,25 +2,37 @@
 
 module IRubyTest
   class JupyterDefaultKernelSpecDirectoryTest < TestBase
-    def setup
-      @kernelspec_dir = IRuby::Jupyter.kernelspec_dir
+    sub_test_case("with JUPYTER_DATA_DIR") do
+      def test_default
+        assert_equal(File.join(ENV["JUPYTER_DATA_DIR"], "kernels"),
+                     IRuby::Jupyter.kernelspec_dir)
+      end
     end
 
-    def test_default_windows
-      windows_only
-      appdata = IRuby::Jupyter.send :windows_user_appdata
-      assert_equal(File.join(appdata, 'jupyter/kernels'), @kernelspec_dir)
-    end
+    sub_test_case("without JUPYTER_DATA_DIR environment variable") do
+      def setup
+        with_env("JUPYTER_DATA_DIR" => nil) do
+          @kernelspec_dir = IRuby::Jupyter.kernelspec_dir
+          yield
+        end
+      end
 
-    def test_default_apple
-      apple_only
-      assert_equal(File.expand_path('~/Library/Jupyter/kernels'), @kernelspec_dir)
-    end
+      def test_default_windows
+        windows_only
+        appdata = IRuby::Jupyter.send :windows_user_appdata
+        assert_equal(File.join(appdata, 'jupyter/kernels'), @kernelspec_dir)
+      end
+
+      def test_default_apple
+        apple_only
+        assert_equal(File.expand_path('~/Library/Jupyter/kernels'), @kernelspec_dir)
+      end
 
-    def test_default_unix
-      unix_only
-      with_env('XDG_DATA_HOME' => nil) do
-        assert_equal(File.expand_path('~/.local/share/jupyter/kernels'), @kernelspec_dir)
+      def test_default_unix
+        unix_only
+        with_env('XDG_DATA_HOME' => nil) do
+          assert_equal(File.expand_path('~/.local/share/jupyter/kernels'), @kernelspec_dir)
+        end
       end
     end
   end