diff-lcs 2.0.0.beta.1 → 2.0.0

data/README.md

@@ -1,14 +1,12 @@
 # Diff::LCS
 
-- home :: https://github.com/halostatue/diff-lcs
-- changelog :: https://github.com/halostatue/diff-lcs/blob/main/CHANGELOG.md
-- code :: https://github.com/halostatue/diff-lcs
-- bugs :: https://github.com/halostatue/diff-lcs/issues
-- rdoc :: http://rubydoc.info/github/halostatue/diff-lcs
+[![RubyGems Version][shield-gems]][rubygems] ![Coveralls][shield-coveralls]
+[![Build Status][shield-ci]][ci-workflow]
 
-<a href="https://github.com/halostatue/diff-lcs/actions">
-  <img src="https://github.com/halostatue/diff-lcs/workflows/CI/badge.svg" />
-</a>
+- code :: <https://github.com/halostatue/diff-lcs>
+- issues :: <https://github.com/halostatue/diff-lcs/issues>
+- docs :: <https://halostatue.github.io/diff-lcs/>
+- changelog :: <https://github.com/halostatue/diff-lcs/blob/main/CHANGELOG.md>
 
 ## Description
 
@@ -16,15 +14,23 @@ Diff::LCS computes the difference between two Enumerable sequences using the
 McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
 to create a simple HTML diff output format and a standard diff-like tool.
 
-This is release 1.6.1, providing a simple extension that allows for
-Diff::LCS::Change objects to be treated implicitly as arrays and fixes a number
-of formatting issues.
+This is release 2.0, which has significant breaking changes (removal of
+deprecations and workarounds) and requires at least Ruby 3.2 or higher. See full
+details in the `CHANGELOG`, but users of diff-lcs should not notice any
+significant changes to the APIs.
 
-Ruby versions below 2.5 are soft-deprecated, which means that older versions are
-no longer part of the CI test suite. If any changes have been introduced that
-break those versions, bug reports and patches will be accepted, but it will be
-up to the reporter to verify any fixes prior to release. The next major release
-will completely break compatibility.
+### Performance and Compatibility
+
+I have not run any benchmarks, but the use of immutable Data classes and the
+removal of a number of inner loop conditionals related to encoding and String
+handling (which have been unnecessary since at least Ruby 2.1 but kept for
+strict compatibility) should allow better optimization by modern Ruby
+implementations.
+
+If you are using RSpec for your test suite, you are unlikely to be able to use
+Diff::LCS 2.0 because of the minimum Ruby version unless the developers of RSpec
+loosen their version constraints. I cannot control this and have raised
+[rspec/rspec#290][rspec-issue-290].
 
 ## Synopsis
 
@@ -88,5 +94,12 @@ Subsequences</em>, CACM, vol.20, no.5, pp.350-353, May 1977, with a few minor
 improvements to improve the speed. A simplified description of the algorithm,
 originally written for the Perl version, was written by Mark-Jason Dominus.
 
+[ci-workflow]: https://github.com/halostatue/diff-lcs/actions/workflows/ci.yml
+[coveralls]: https://coveralls.io/github/halostatue/diff-lcs?branch=main
+[perl]: https://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/
+[rspec-issue-290]: https://github.com/rspec/rspec/issues/290
+[rubygems]: https://rubygems.org/gems/diff-lcs
+[shield-ci]: https://img.shields.io/github/actions/workflow/status/halostatue/diff-lcs/ci.yml?style=for-the-badge "Build Status"
+[shield-coveralls]: https://img.shields.io/coverallsCoverage/github/halostatue/diff-lcs?style=for-the-badge
+[shield-gems]: https://img.shields.io/gem/v/diff-lcs?style=for-the-badge "Version"
 [smalltalk]: ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st
-[perl]: http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/

data/Rakefile

@@ -1,17 +1,16 @@
 require "rubygems"
-require "rspec"
-require "rspec/core/rake_task"
 require "hoe"
 require "rake/clean"
 require "rdoc/task"
+require "minitest/test_task"
 
 Hoe.plugin :halostatue
-Hoe.plugin :rubygems
 
 Hoe.plugins.delete :debug
 Hoe.plugins.delete :newb
 Hoe.plugins.delete :publish
 Hoe.plugins.delete :signing
+Hoe.plugins.delete :test
 
 hoe = Hoe.spec "diff-lcs" do
   developer("Austin Ziegler", "halostatue@gmail.com")
@@ -27,10 +26,12 @@ hoe = Hoe.spec "diff-lcs" do
   }
 
   extra_dev_deps << ["hoe", "~> 4.0"]
-  extra_dev_deps << ["hoe-halostatue", "~> 2.1", ">= 2.1.1"]
-  extra_dev_deps << ["rspec", ">= 2.0", "< 4"]
+  extra_dev_deps << ["hoe-halostatue", "~> 3.0"]
+  extra_dev_deps << ["minitest", "~> 6.0"]
+  extra_dev_deps << ["minitest-autotest", "~> 1.0"]
+  extra_dev_deps << ["minitest-focus", "~> 1.1"]
   extra_dev_deps << ["rake", ">= 10.0", "< 14"]
-  extra_dev_deps << ["rdoc", ">= 6.3.1", "< 7"]
+  extra_dev_deps << ["rdoc", ">= 6.0", "< 8"]
   extra_dev_deps << ["simplecov", "~> 0.9"]
   extra_dev_deps << ["simplecov-lcov", "~> 0.9"]
   extra_dev_deps << ["standard", "~> 1.50"]
@@ -38,24 +39,33 @@ hoe = Hoe.spec "diff-lcs" do
   extra_dev_deps << ["fasterer", "~> 0.11"]
 end
 
-desc "Run all specifications"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  rspec_dirs = %w[spec lib].join(":")
-  t.rspec_opts = ["-I#{rspec_dirs}"]
-end
+Minitest::TestTask.create :test
+Minitest::TestTask.create :coverage do |t|
+  formatters = <<-RUBY.split($/).join(" ")
+    SimpleCov::Formatter::MultiFormatter.new([
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::LcovFormatter,
+      SimpleCov::Formatter::SimpleFormatter
+    ])
+  RUBY
+  t.test_prelude = <<-RUBY.split($/).join("; ")
+  require "simplecov"
+  require "simplecov-lcov"
 
-namespace :spec do
-  desc "Runs test coverage. Only works Ruby 2.0+ and assumes 'simplecov' is installed."
-  task :coverage do
-    Rake::Task["spec"].execute
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    config.report_with_single_file = true
+    config.lcov_file_name = "lcov.info"
   end
-end
 
-task coverage: "spec:coverage"
-Rake::Task["spec"].actions.uniq! { |a| a.source_location }
+  SimpleCov.start "test_frameworks" do
+    enable_coverage :branch
+    primary_coverage :branch
+    formatter #{formatters}
+  end
+  RUBY
+end
 
-task default: :spec unless Rake::Task["default"].prereqs.include?("spec")
-task test: :spec unless Rake::Task["test"].prereqs.include?("spec")
+task default: :test
 
 task :version do
   require "diff/lcs/version"
@@ -64,10 +74,68 @@ end
 
 RDoc::Task.new do |config|
   config.title = "diff-lcs"
-  # config.main = "lib/diff/lcs.rb"
   config.main = "README.md"
   config.rdoc_dir = "doc"
-  config.rdoc_files = hoe.spec.require_paths - ["Manifest.txt"] + hoe.spec.extra_rdoc_files
+  config.rdoc_files = hoe.spec.require_paths + hoe.spec.extra_rdoc_files -
+    FileList["integration/golden/*.txt", "Manifest.txt"].to_a
   config.markup = "markdown"
 end
 task docs: :rerdoc
+
+def rspec_to_golden(file)
+  File.join("integration/golden", File.basename(file, "_spec.rb")) + ".txt"
+end
+
+def normalize_rspec_output(data)
+  data
+    .gsub(/Randomized with seed \d+/, "Randomized with seed XXXXX")
+    .gsub(/Finished in [\d.]+ seconds/, "Finished in X.XXXXX seconds")
+    .gsub(/files took [\d.]+ seconds to load/, "files took X.XXXXX seconds to load")
+end
+
+def unbundled(&block)
+  if defined?(Bundler)
+    Bundler.with_unbundled_env(&block)
+  else
+    block.call
+  end
+end
+
+rspecs = FileList["integration/compare/*_spec.rb"]
+
+namespace :integration do
+  desc "Compare RSpec output with and without diff-lcs 2"
+  task :compare do
+    require "tempfile"
+    base = Tempfile.create("baseline") { _1.path }
+    work = Tempfile.create("working") { _1.path }
+
+    unbundled { sh "gem install rspec" }
+
+    rspecs.to_a.each do |rspec_file|
+      basename = File.basename(rspec_file, "_spec.rb")
+
+      base_contents = unbundled { `integration/runner rspec #{rspec_file} 2>&1` }
+      base_contents = normalize_rspec_output(base_contents)
+
+      work_contents = unbundled { `integration/runner rspec -Ilib -rdiff/lcs #{rspec_file} 2>&1` }
+      work_contents = normalize_rspec_output(work_contents)
+
+      if base_contents == work_contents
+        puts "#{basename}: OK"
+      else
+        puts "#{basename}: FAIL"
+
+        File.write(base, base_contents)
+        File.write(work, work_contents)
+
+        unbundled { sh "integration/runner -Ilib bin/ldiff -U #{base} #{work}" }
+      end
+    end
+  end
+end
+
+desc "Run RSpec integration tests with diff-lcs 2.0"
+task integration: ["integration:compare"] do
+  sh "rspec -Ilib -r diff/lcs integration/*_spec.rb"
+end

data/SECURITY.md

@@ -22,24 +22,15 @@ All issues raised must be demonstrated on the minimum supported Ruby version.
 >
 > | Version | Release Date | Support Ends | Security Support Ends |
 > | ------- | ------------ | ------------ | --------------------- |
-> | 1.x     | 2010         | 2026-04-30   | 2027-01-31            |
-> | 2.x     | 2026-01-31   | -            | -                     |
+> | 1.x     | 2010         | 2026-05-01   | 2027-02-01            |
+> | 2.x     | 2026-02-01   | -            | -                     |
 
 ## Reporting a Vulnerability
 
 Report vulnerabilities via the [Tidelift security contact][tidelift]. Tidelift
 will coordinate the fix and disclosure.
 
-Alternatively, create a [private vulnerability report][advisory] with GitHub or
-send an email to [security@ruby.halostatue.ca][email] with the text `diff-lcs`
-in the subject. Emails sent to this address should be encrypted using [age][age]
-with the following public key:
-
-```
-age1fc6ngxmn02m62fej5cl30lrvwmxn4k3q2atqu53aatekmnqfwumqj4g93w
-```
+Alternatively, create a [private vulnerability report][advisory] with GitHub.
 
 [advisory]: https://github.com/halostatue/diff-lcs/security/advisories/new
-[age]: https://github.com/FiloSottile/age
-[email]: mailto:security@ruby.halostatue.ca
 [tidelift]: https://tidelift.com/security

data/integration/compare/array_diff_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.describe "Array diff failure" do
+  it "shows diff for array with different elements" do
+    expected = ["apple", "banana", "cherry", "date", "elderberry"]
+    actual = ["apple", "blueberry", "cherry", "date", "elderberry"]
+
+    expect(actual).to eq(expected)
+  end
+end

data/integration/compare/hash_diff_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.describe "Hash diff failure" do
+  it "shows diff for nested hash mismatch" do
+    expected = {
+      name: "John",
+      age: 30,
+      address: {
+        city: "New York",
+        zip: "10001"
+      }
+    }
+
+    actual = {
+      name: "John",
+      age: 35,
+      address: {
+        city: "Boston",
+        zip: "10001"
+      }
+    }
+
+    expect(actual).to eq(expected)
+  end
+end

data/integration/compare/string_diff_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.describe "String diff failure" do
+  it "shows diff for multiline string mismatch" do
+    expected = "line1\nline2\nline3\nline4\nline5\n"
+    actual = "line1\nchanged\nline3\nline4\nline5\n"
+
+    expect(actual).to eq(expected)
+  end
+end

data/integration/rspec_differ_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Integration test to verify diff-lcs 2.0 works with RSpec's differ
+# This runs RSpec with diff-lcs 1.x installed but loads the repo version
+
+RSpec.describe "Diff::LCS 2.0 with RSpec::Support::Differ" do
+  let(:differ) { RSpec::Support::Differ.new }
+
+  it "produces diff output for multiline strings" do
+    expected = "foo\nzap\nbar\n"
+    actual = "foo\nbar\nzap\n"
+
+    diff = differ.diff(actual, expected)
+
+    expect(diff).to be_a(String)
+    expect(diff).not_to be_empty
+  end
+
+  it "handles identical strings" do
+    str = "same\n"
+    diff = differ.diff(str, str)
+
+    # May return empty or just newline depending on implementation
+    expect(diff.strip).to be_empty
+  end
+end

data/integration/rspec_expectations_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Integration test for RSpec expectation failures that use diff-lcs
+# Verifies that diff output is generated correctly with diff-lcs 2.0
+
+RSpec.describe "Diff::LCS 2.0 with RSpec expectations" do
+  it "produces diff for failed multiline string equality" do
+    expect {
+      expect("foo\nbar\nbaz").to eq("foo\nqux\nbaz")
+    }.to raise_error(RSpec::Expectations::ExpectationNotMetError) do |error|
+      expect(error.message).to include("Diff:")
+      expect(error.message).to match(/[-+](qux|bar)/)
+    end
+  end
+
+  it "produces diff for failed hash equality" do
+    expect {
+      expect({a: 1, b: 2}).to eq({a: 1, b: 3})
+    }.to raise_error(RSpec::Expectations::ExpectationNotMetError) do |error|
+      expect(error.message).to include("Diff:")
+    end
+  end
+
+  it "does not crash when comparing complex objects" do
+    obj1 = {a: [1, 2, 3], b: "test"}
+    obj2 = {a: [1, 4, 3], b: "test"}
+
+    expect {
+      expect(obj1).to eq(obj2)
+    }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
+  end
+end

data/integration/runner

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "rbconfig"
+require "rubygems"
+
+if ENV["CI"]
+  vendor_dir = Dir.glob(File.join(Dir.pwd, "vendor", "bundle", "{ruby,jruby,truffleruby}", "*")).max
+  unless vendor_dir && Dir.exist?(vendor_dir)
+    fail "vendor bundle not found; expected vendor/bundle/ruby/*"
+  end
+
+  # Prefer vendored gems, fall back to system gem dir
+  ENV["GEM_HOME"] = vendor_dir
+  ENV["GEM_PATH"] = "#{vendor_dir}:#{Gem.default_dir}"
+
+  # Ensure Gem.path is updated for the running process (affects Gem.lookup)
+  Gem.use_paths(ENV["GEM_HOME"], ENV["GEM_PATH"].split(":"))
+end
+
+exec RbConfig.ruby, "-S", *ARGV

data/lib/diff/lcs/change.rb

@@ -10,7 +10,7 @@ class Diff::LCS::Change
   # (changed), '<' (tail changes from first sequence), or '>' (tail changes from second
   # sequence). The last two ('<>') are only found with Diff::LCS::diff and
   # Diff::LCS::sdiff.
-  VALID_ACTIONS = %w[+ - = ! > <].freeze
+  VALID_ACTIONS = %w[= - + ! > <].freeze
 
   def self.valid_action?(action) = VALID_ACTIONS.include?(action)
 
@@ -37,6 +37,9 @@ class Diff::LCS::Change
 
   def to_a = [action, position, element]
   alias_method :to_ary, :to_a
+  alias_method :deconstruct, :to_a
+
+  def deconstruct_keys(_) = {action:, position:, element:}
 
   def self.from_a(arr)
     case arr
@@ -59,8 +62,8 @@ class Diff::LCS::Change
   end
 
   def <=>(other)
-    r = action <=> other.action
-    r = position <=> other.position if r.zero?
+    r = position <=> other.position
+    r = VALID_ACTIONS.index(action) <=> VALID_ACTIONS.index(other.action) if r.zero?
     r = element <=> other.element if r.zero?
     r
   end
@@ -111,28 +114,27 @@ class Diff::LCS::ContextChange
 
   def to_a = [action, [old_position, old_element], [new_position, new_element]]
   alias_method :to_ary, :to_a
+  alias_method :deconstruct, :to_a
+
+  def deconstruct_keys(_) = {action:, old_position:, old_element:, new_position:, new_element:}
 
   def self.from_a(arr) = Diff::LCS::Change.from_a(arr)
 
   # Simplifies a context change for use in some diff callbacks. '<' actions are converted
   # to '-' and '>' actions are converted to '+'.
   def self.simplify(event)
-    ea = event.to_a
-
-    case ea[0]
+    case event.action
     when "-"
-      ea[2][1] = nil
+      event.with(new_element: nil)
     when "<"
-      ea[0] = "-"
-      ea[2][1] = nil
+      event.with(action: "-", new_element: nil)
     when "+"
-      ea[1][1] = nil
+      event.with(old_element: nil)
     when ">"
-      ea[0] = "+"
-      ea[1][1] = nil
+      event.with(action: "+", old_element: nil)
+    else
+      event
     end
-
-    from_a(ea)
   end
 
   def ==(other)
@@ -145,9 +147,12 @@ class Diff::LCS::ContextChange
   end
 
   def <=>(other)
-    r = action <=> other.action
-    r = old_position <=> other.old_position if r.zero?
+    r = old_position <=> other.old_position
     r = new_position <=> other.new_position if r.zero?
+    if r.zero?
+      r = Diff::LCS::Change::VALID_ACTIONS.index(action) <=>
+        Diff::LCS::Change::VALID_ACTIONS.index(other.action)
+    end
     r = old_element <=> other.old_element if r.zero?
     r = new_element <=> other.new_element if r.zero?
     r

data/lib/diff/lcs/ldiff.rb

@@ -16,9 +16,14 @@ class Diff::LCS::Ldiff # :nodoc:
     MIT licence.
   COPYRIGHT
 
-  InputInfo = Struct.new(:filename, :data, :stat) do
+  InputInfo = Struct.new(:filename, :data, :mtime) do
     def initialize(filename)
-      super(filename, ::File.read(filename), ::File.stat(filename))
+      if filename == "-"
+        super("<stdin>", $stdin.read, Time.now)
+        return
+      end
+
+      super(filename, ::File.read(filename), ::File.stat(filename).mtime)
     end
   end
 
@@ -142,9 +147,9 @@ class Diff::LCS::Ldiff # :nodoc:
       output << "Files #{info_old.filename} and #{info_new.filename} differ\n"
       return true
     when :unified, :context
-      ft = info_old.stat.mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
+      ft = info_old.mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
       output << "#{char_old} #{info_old.filename}\t#{ft}\n"
-      ft = info_new.stat.mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
+      ft = info_new.mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
       output << "#{char_new} #{info_new.filename}\t#{ft}\n"
     when :ed
       output = []

data/lib/diff/lcs/version.rb

@@ -2,6 +2,6 @@
 
 module Diff
   module LCS
-    VERSION = "2.0.0.beta.1"
+    VERSION = "2.0.0"
   end
 end

data/spec/hunk_spec.rb

@@ -2,71 +2,69 @@
 
 require "spec_helper"
 
-if String.method_defined?(:encoding)
-  require "diff/lcs/hunk"
+require "diff/lcs/hunk"
 
-  describe Diff::LCS::Hunk do
-    let(:old_data) { ["Tu a un carté avec {count} itéms".encode("UTF-16LE")] }
-    let(:new_data) { ["Tu a un carte avec {count} items".encode("UTF-16LE")] }
-    let(:pieces) { Diff::LCS.diff old_data, new_data }
-    let(:hunk) { Diff::LCS::Hunk.new(old_data, new_data, pieces[0], 3, 0) }
+describe Diff::LCS::Hunk do
+  let(:old_data) { ["Tu a un carté avec {count} itéms".encode("UTF-16LE")] }
+  let(:new_data) { ["Tu a un carte avec {count} items".encode("UTF-16LE")] }
+  let(:pieces) { Diff::LCS.diff old_data, new_data }
+  let(:hunk) { Diff::LCS::Hunk.new(old_data, new_data, pieces[0], 3, 0) }
 
-    it "produces a unified diff from the two pieces" do
-      expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
+  it "produces a unified diff from the two pieces" do
+    expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
         @@ -1 +1 @@
         -Tu a un carté avec {count} itéms
         +Tu a un carte avec {count} items
-      EXPECTED
+    EXPECTED
 
-      expect(hunk.diff(:unified)).to eq(expected)
-    end
+    expect(hunk.diff(:unified)).to eq(expected)
+  end
 
-    it "produces a unified diff from the two pieces (last entry)" do
-      expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
+  it "produces a unified diff from the two pieces (last entry)" do
+    expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
         @@ -1 +1 @@
         -Tu a un carté avec {count} itéms
         +Tu a un carte avec {count} items
         \
-      EXPECTED
+    EXPECTED
 
-      expect(hunk.diff(:unified, true)).to eq(expected)
-    end
+    expect(hunk.diff(:unified, true)).to eq(expected)
+  end
 
-    it "produces a context diff from the two pieces" do
-      expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
+  it "produces a context diff from the two pieces" do
+    expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
         ***************
         *** 1 ****
         ! Tu a un carté avec {count} itéms
         --- 1 ----
         ! Tu a un carte avec {count} items
-      EXPECTED
+    EXPECTED
 
-      expect(hunk.diff(:context)).to eq(expected)
-    end
+    expect(hunk.diff(:context)).to eq(expected)
+  end
 
-    it "produces an old diff from the two pieces" do
-      expected = <<-EXPECTED.gsub(/^ +/, "").encode("UTF-16LE").chomp
+  it "produces an old diff from the two pieces" do
+    expected = <<-EXPECTED.gsub(/^ +/, "").encode("UTF-16LE").chomp
         1c1
         < Tu a un carté avec {count} itéms
         ---
         > Tu a un carte avec {count} items
 
-      EXPECTED
+    EXPECTED
 
-      expect(hunk.diff(:old)).to eq(expected)
-    end
+    expect(hunk.diff(:old)).to eq(expected)
+  end
 
-    context "with empty first data set" do
-      let(:old_data) { [] }
+  context "with empty first data set" do
+    let(:old_data) { [] }
 
-      it "produces a unified diff" do
-        expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
+    it "produces a unified diff" do
+      expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
           @@ -0,0 +1 @@
           +Tu a un carte avec {count} items
-        EXPECTED
+      EXPECTED
 
-        expect(hunk.diff(:unified)).to eq(expected)
-      end
+      expect(hunk.diff(:unified)).to eq(expected)
     end
   end
 end

data/spec/ldiff_spec.rb

@@ -27,11 +27,11 @@ RSpec.describe "bin/ldiff" do
   def self.test_ldiff(fixture)
     desc = [
       fixture[:flag],
-      "spec/fixtures/#{fixture[:left]}",
-      "spec/fixtures/#{fixture[:right]}",
+      "test/fixtures/#{fixture[:left]}",
+      "test/fixtures/#{fixture[:right]}",
       "#",
       "=>",
-      "spec/fixtures/ldiff/output.#{fixture[:name]}#{fixture[:flag]}"
+      "test/fixtures/ldiff/output.#{fixture[:name]}#{fixture[:flag]}"
     ].join(" ")
 
     it desc do
@@ -49,7 +49,7 @@ RSpec.describe "bin/ldiff" do
   def read_fixture(options, mode: "output", allow_missing: false)
     fixture = options.fetch(:name)
     flag = options.fetch(:flag)
-    name = "spec/fixtures/ldiff/#{mode}.#{fixture}#{flag}"
+    name = "test/fixtures/ldiff/#{mode}.#{fixture}#{flag}"
 
     return "" if !::File.exist?(name) && allow_missing
 
@@ -74,7 +74,7 @@ RSpec.describe "bin/ldiff" do
         ^
         [-+*]{3}
         \s*
-        spec/fixtures/(\S+)
+        test/fixtures/(\S+)
         \s*
         \d{4}-\d\d-\d\d
         \s*
@@ -82,7 +82,7 @@ RSpec.describe "bin/ldiff" do
         \s*
         (?:[-+]\d{4}|Z)
       }x,
-      '*** spec/fixtures/\1	0000-00-00 :00 =>:00 =>00.000000000 -0000'
+      '*** test/fixtures/\1	0000-00-00 :00 =>:00 =>00.000000000 -0000'
     )
   end
 
@@ -92,7 +92,7 @@ RSpec.describe "bin/ldiff" do
     right = options.fetch(:right)
 
     stdout, stderr = capture_subprocess_io do
-      system("ruby -Ilib bin/ldiff #{flag} spec/fixtures/#{left} spec/fixtures/#{right}")
+      system("ruby -Ilib bin/ldiff #{flag} test/fixtures/#{left} test/fixtures/#{right}")
     end
 
     [clean_data(stdout, flag), stderr, $?.exitstatus]