From a30ad8abf73f5fee7496a00df5b6c7c6677c344c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20L=C3=B6wenfels?= <282+dfl@users.noreply.github.com> Date: Thu, 15 Jan 2026 15:58:42 +0000 Subject: [PATCH] chore: migrate test fixtures to new trbconfig.yml schema - Update spec/e2e/keyword_args_spec.rb to use source/output/compiler keys - Update spec/e2e/integration_spec.rb to use new config format - Update spec/t_ruby/cli_init_spec.rb to use new config format - Remove dead legacy config code in spec/t_ruby/compiler_spec.rb The legacy schema migration tests in config_spec.rb are intentionally kept using the old format to verify migration behavior. Co-Authored-By: Claude Opus 4.5 --- spec/e2e/integration_spec.rb | 28 ++++++++++++++-------------- spec/e2e/keyword_args_spec.rb | 16 ++++++++-------- spec/t_ruby/cli_init_spec.rb | 2 +- spec/t_ruby/compiler_spec.rb | 7 +------ 4 files changed, 24 insertions(+), 29 deletions(-) diff --git a/spec/e2e/integration_spec.rb b/spec/e2e/integration_spec.rb index f168d9e..fc231d2 100644 --- a/spec/e2e/integration_spec.rb +++ b/spec/e2e/integration_spec.rb @@ -19,13 +19,13 @@ # Create trbconfig.yml config to set output dir File.write(File.join(tmpdir, "trbconfig.yml"), <<~YAML) - emit: - rb: true - rbs: false - dtrb: false - paths: - src: "#{lib_dir}" - out: "#{lib_dir}" + source: + include: + - "#{lib_dir}" + output: + ruby_dir: "#{lib_dir}" + compiler: + generate_rbs: false YAML # Main application file @@ -95,13 +95,13 @@ def create_user(email: Email, name: String): User # Create trbconfig.yml config to set output dir File.write(File.join(tmpdir, "trbconfig.yml"), <<~YAML) - emit: - rb: true - rbs: false - dtrb: false - paths: - src: "#{lib_dir}" - out: "#{lib_dir}" + source: + include: + - "#{lib_dir}" + output: + ruby_dir: "#{lib_dir}" + compiler: + generate_rbs: false YAML # Create initial file diff --git a/spec/e2e/keyword_args_spec.rb b/spec/e2e/keyword_args_spec.rb index bb5f74b..1ce09bc 100644 --- a/spec/e2e/keyword_args_spec.rb +++ b/spec/e2e/keyword_args_spec.rb @@ -13,14 +13,14 @@ def create_config(lib_dir) File.write(File.join(tmpdir, "trbconfig.yml"), <<~YAML) - emit: - rb: true - rbs: true - dtrb: false - paths: - src: "#{lib_dir}" - out: "#{lib_dir}" - rbs: "#{lib_dir}" + source: + include: + - "#{lib_dir}" + output: + ruby_dir: "#{lib_dir}" + rbs_dir: "#{lib_dir}" + compiler: + generate_rbs: true YAML config = TRuby::Config.new(File.join(tmpdir, "trbconfig.yml")) diff --git a/spec/t_ruby/cli_init_spec.rb b/spec/t_ruby/cli_init_spec.rb index 483ca82..b8b9388 100644 --- a/spec/t_ruby/cli_init_spec.rb +++ b/spec/t_ruby/cli_init_spec.rb @@ -78,7 +78,7 @@ it "reports project already initialized when everything exists" do Dir.chdir(tmpdir) do - File.write("trbconfig.yml", "emit:\n rb: true\n") + File.write("trbconfig.yml", "source:\n include: [src]\n") Dir.mkdir("src") Dir.mkdir("build") diff --git a/spec/t_ruby/compiler_spec.rb b/spec/t_ruby/compiler_spec.rb index 61841b1..0da7367 100644 --- a/spec/t_ruby/compiler_spec.rb +++ b/spec/t_ruby/compiler_spec.rb @@ -22,12 +22,7 @@ input_file = File.join(tmpdir, "test.trb") File.write(input_file, "puts 'Hello, world!'") - # Create a custom config with output in tmpdir - { - "emit" => { "rb" => true, "rbs" => false, "dtrb" => false }, - "paths" => { "src" => "./src", "out" => tmpdir }, - "strict" => { "rbs_compat" => true, "null_safety" => false, "inference" => "basic" }, - } + # Mock config to use tmpdir as output allow_any_instance_of(TRuby::Config).to receive(:out_dir).and_return(tmpdir) allow_any_instance_of(TRuby::Config).to receive(:src_dir).and_return("./src")