super_diff 0.7.0 → 0.8.0

data/spec/integration/rails/active_support_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+RSpec.describe "Integration with ActiveSupport", type: :integration do
+  context "when using 'super_diff/rspec-rails'" do
+    include_context "integration with ActiveSupport"
+
+    def make_program(test, color_enabled:)
+      make_rspec_rails_test_program(test, color_enabled: color_enabled)
+    end
+  end
+
+  context "when using 'super_diff/active_support'" do
+    include_context "integration with ActiveSupport"
+
+    def make_program(test, color_enabled:)
+      make_rspec_active_record_program(test, color_enabled: color_enabled)
+    end
+  end
+end

data/spec/integration/rspec/contain_exactly_matcher_spec.rb

@@ -33,7 +33,8 @@ RSpec.describe "Integration with RSpec's #contain_exactly matcher", type: :integ
             plain_line    %|    "Marty",|
             actual_line   %|+   "Jennifer",|
             actual_line   %|+   "Doc",|
-            expected_line %|-   "Einie"|
+            # expected_line %|-   "Einie"|  # TODO
+            expected_line %|-   "Einie",|
             plain_line    %|  ]|
           },
         )
@@ -132,7 +133,8 @@ RSpec.describe "Integration with RSpec's #contain_exactly matcher", type: :integ
               plain_line    %|    "Lorraine McFly",|
               actual_line   %|+   "Einie",|
               expected_line %|-   "Biff Tannen",|
-              expected_line %|-   "George McFly"|
+              # expected_line %|-   "George McFly"|  # TODO
+              expected_line %|-   "George McFly",|
               plain_line    %|  ]|
             },
           )
@@ -243,7 +245,8 @@ RSpec.describe "Integration with RSpec's #contain_exactly matcher", type: :integ
               actual_line   %|+   "Lorraine McFly",|
               expected_line %|-   "Biff Tannen",|
               expected_line %|-   /Georg McFly/,|
-              expected_line %|-   /Lorrain McFly/|
+              # expected_line %|-   /Lorrain McFly/|  # TODO
+              expected_line %|-   /Lorrain McFly/,|
               plain_line    %|  ]|
             },
           )
@@ -330,7 +333,7 @@ RSpec.describe "Integration with RSpec's #contain_exactly matcher", type: :integ
             expectation: proc {
               line do
                 plain    %|          Expected |
-                actual   %|[{ foo: "bar" }, #<Double (anonymous)>, { blargh: "riddle" }]|
+                actual   %|[{ foo: "bar" }, #<Double (anonymous) baz: "qux">, { blargh: "riddle" }]|
               end
 
               line do
@@ -347,13 +350,16 @@ RSpec.describe "Integration with RSpec's #contain_exactly matcher", type: :integ
               plain_line    %|    {|
               plain_line    %|      foo: "bar"|
               plain_line    %|    },|
-              plain_line    %|    #<Double (anonymous)>,|
+              plain_line    %|    #<Double (anonymous) {|
+              plain_line    %|      baz: "qux"|
+              plain_line    %|    }>,|
               actual_line   %|+   {|
               actual_line   %|+     blargh: "riddle"|
               actual_line   %|+   },|
               expected_line %|-   #<a collection containing exactly (|
               expected_line %|-     "zing"|
-              expected_line %|-   )>|
+              # expected_line %|-   )>|  # TODO
+              expected_line %|-   )>,|
               plain_line    %|  ]|
             },
           )

data/spec/integration/rspec/eq_matcher_spec.rb

@@ -253,70 +253,6 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
     end
   end
 
-  context "when comparing two different Time and ActiveSupport::TimeWithZone instances", active_record: true do
-    it "produces the correct failure message when used in the positive" do
-      as_both_colored_and_uncolored do |color_enabled|
-        snippet = <<~RUBY
-          expected = Time.utc(2011, 12, 13, 14, 15, 16)
-          actual   = Time.utc(2011, 12, 13, 15, 15, 16).in_time_zone("Europe/Stockholm")
-          expect(expected).to eq(actual)
-        RUBY
-        program = make_rspec_rails_test_program(
-          snippet,
-          color_enabled: color_enabled,
-        )
-
-        expected_output = build_expected_output(
-          color_enabled: color_enabled,
-          snippet: %|expect(expected).to eq(actual)|,
-          expectation: proc {
-            line do
-              plain    %|Expected |
-              actual   %|#<Time 2011-12-13 14:15:16 +00:00 (UTC)>|
-            end
-
-            line do
-              plain    %|   to eq |
-              expected %|#<ActiveSupport::TimeWithZone 2011-12-13 16:15:16 +01:00 (CET)>|
-            end
-          },
-          diff: proc {
-            plain_line    %|  #<ActiveSupport::TimeWithZone {|
-            plain_line    %|    year: 2011,|
-            plain_line    %|    month: 12,|
-            plain_line    %|    day: 13,|
-            expected_line %|-   hour: 16,|
-            actual_line   %|+   hour: 14,|
-            plain_line    %|    min: 15,|
-            plain_line    %|    sec: 16,|
-            plain_line    %|    subsec: 0,|
-            expected_line %|-   zone: \"CET\",|
-            actual_line   %|+   zone: \"UTC\",|
-            expected_line %|-   utc_offset: 3600,|
-            actual_line   %|+   utc_offset: 0,|
-            plain_line    %|    utc: #<Time {|
-            plain_line    %|      year: 2011,|
-            plain_line    %|      month: 12,|
-            plain_line    %|      day: 13,|
-            expected_line %|-     hour: 15,|
-            actual_line   %|+     hour: 14,|
-            plain_line    %|      min: 15,|
-            plain_line    %|      sec: 16,|
-            plain_line    %|      subsec: 0,|
-            plain_line    %|      zone: "UTC",|
-            plain_line    %|      utc_offset: 0|
-            plain_line    %|    }>|
-            plain_line    %|  }>|
-          },
-        )
-
-        expect(program).
-          to produce_output_when_run(expected_output).
-          in_color(color_enabled)
-      end
-    end
-  end
-
   context "when comparing a single-line string with a multi-line string" do
     it "produces the correct failure message" do
       as_both_colored_and_uncolored do |color_enabled|
@@ -529,8 +465,8 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
             plain_line    %|        data: {|
             expected_line %|-         "sticky" => true,|
             actual_line   %|+         "sticky" => false,|
-            actual_line   %|+         role: "deprecated",|
-            plain_line    %|          person: #<SuperDiff::Test::Person {|
+            actual_line   %|+         :role => "deprecated",|
+            plain_line    %|          :person => #<SuperDiff::Test::Person {|
             expected_line %|-           name: "Marty",|
             actual_line   %|+           name: "Doc",|
             plain_line    %|            age: 60|
@@ -844,17 +780,14 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
           snippet: %|expect(actual).to eq(expected)|,
           newline_before_expectation: true,
           expectation: proc {
-            if SuperDiff::Test.jruby?
-            else
-              line do
-                plain    %|Expected |
-                actual   %|#<SuperDiff::Test::Player @handle="mcmire", @character="Jon", @inventory=["sword"], @shields=11.4, @health=4, @ultimate=true>|
-              end
-
-              line do
-                plain    %|   to eq |
-                expected %|#<SuperDiff::Test::Item @name="camera", @quantity=3>|
-              end
+            line do
+              plain    %|Expected |
+              actual   %|#<SuperDiff::Test::Player @character="Jon", @handle="mcmire", @health=4, @inventory=["sword"], @shields=11.4, @ultimate=true>|
+            end
+
+            line do
+              plain    %|   to eq |
+              expected %|#<SuperDiff::Test::Item @name="camera", @quantity=3>|
             end
           },
         )
@@ -882,17 +815,14 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
           snippet: %|expect(value).not_to eq(value)|,
           newline_before_expectation: true,
           expectation: proc {
-            if SuperDiff::Test.jruby?
-            else
-              line do
-                plain    %| Expected |
-                actual   %|#<SuperDiff::Test::Item @name="camera", @quantity=3>|
-              end
-
-              line do
-                plain    %|not to eq |
-                expected %|#<SuperDiff::Test::Item @name="camera", @quantity=3>|
-              end
+            line do
+              plain    %| Expected |
+              actual   %|#<SuperDiff::Test::Item @name="camera", @quantity=3>|
+            end
+
+            line do
+              plain    %|not to eq |
+              expected %|#<SuperDiff::Test::Item @name="camera", @quantity=3>|
             end
           },
         )
@@ -1019,4 +949,8 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
       end
     end
   end
+
+  it_behaves_like "a matcher that supports elided diffs" do
+    let(:matcher) { :eq }
+  end
 end

data/spec/integration/rspec/have_attributes_matcher_spec.rb

@@ -109,8 +109,8 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher", type: :integ
                 plain_line    %|    name: "a",|
                 # plain_line    %|    age: 9,|  # FIXME
                 plain_line    %|    age: 9|
-                # expected_line %|-   foo: "bar",|  # FIXME
-                expected_line %|-   foo: "bar"|
+                # expected_line %|-   foo: "bar"|  # FIXME
+                expected_line %|-   foo: "bar",|
                 plain_line    %|  }>|
               },
             )
@@ -170,8 +170,7 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher", type: :integ
                 expected_line %|-   city: "Oakland",|
                 actual_line   %|+   city: "Hill Valley",|
                 plain_line    %|    state: "CA",|
-                # expected_line %|-   zip: "91234",|  # FIXME
-                expected_line %|-   zip: "91234"|
+                expected_line %|-   zip: "91234",|  # FIXME
                 actual_line   %|+   zip: "90382"|
                 plain_line    %|  }>|
               },
@@ -283,9 +282,9 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher", type: :integ
                 plain_line    %|    state: "CA",|
                 # plain_line    %|    zip: "90382",|  # FIXME
                 plain_line    %|    zip: "90382"|
-                # expected_line %|-   foo: "bar",|  # FIXME
-                expected_line %|-   foo: "bar"|
-                expected_line %|-   baz: "qux"|
+                expected_line %|-   foo: "bar",|
+                # expected_line %|-   baz: "qux"|  # TODO
+                expected_line %|-   baz: "qux",|
                 plain_line    %|  }>|
               },
             )

data/spec/integration/rspec/match_array_matcher_spec.rb

@@ -33,7 +33,8 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
             plain_line    %|    "Marty",|
             actual_line   %|+   "Jennifer",|
             actual_line   %|+   "Doc",|
-            expected_line %|-   "Einie"|
+            # expected_line %|-   "Einie"|  # TODO
+            expected_line %|-   "Einie",|
             plain_line    %|  ]|
           },
         )
@@ -132,7 +133,8 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
               plain_line    %|    "Lorraine McFly",|
               actual_line   %|+   "Einie",|
               expected_line %|-   "Biff Tannen",|
-              expected_line %|-   "George McFly"|
+              # expected_line %|-   "George McFly"|  # TODO
+              expected_line %|-   "George McFly",|
               plain_line    %|  ]|
             },
           )
@@ -243,7 +245,8 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
               actual_line   %|+   "Lorraine McFly",|
               expected_line %|-   "Biff Tannen",|
               expected_line %|-   /Georg McFly/,|
-              expected_line %|-   /Lorrain McFly/|
+              # expected_line %|-   /Lorrain McFly/|  # TODO
+              expected_line %|-   /Lorrain McFly/,|
               plain_line    %|  ]|
             },
           )
@@ -333,7 +336,7 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
               line do
                 plain    %|           Expected |
                 # rubocop:disable Metrics/LineLength
-                actual   %|[{ foo: "bar" }, #<Double (anonymous)>, { blargh: "riddle" }]|
+                actual   %|[{ foo: "bar" }, #<Double (anonymous) baz: "qux">, { blargh: "riddle" }]|
                 # rubocop:enable Metrics/LineLength
               end
 
@@ -351,13 +354,16 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
               plain_line    %|    {|
               plain_line    %|      foo: "bar"|
               plain_line    %|    },|
-              plain_line    %|    #<Double (anonymous)>,|
+              plain_line    %|    #<Double (anonymous) {|
+              plain_line    %|      baz: "qux"|
+              plain_line    %|    }>,|
               actual_line   %|+   {|
               actual_line   %|+     blargh: "riddle"|
               actual_line   %|+   },|
               expected_line %|-   #<a collection containing exactly (|
               expected_line %|-     "zing"|
-              expected_line %|-   )>|
+              # expected_line %|-   )>|  # TODO
+              expected_line %|-   )>,|
               plain_line    %|  ]|
             },
           )
@@ -400,7 +406,8 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
             actual_line   %|+   "Marty",|
             actual_line   %|+   "Jennifer",|
             actual_line   %|+   "Doc",|
-            expected_line %|-   "Einie"|
+            # expected_line %|-   "Einie"|  # TODO
+            expected_line %|-   "Einie",|
             plain_line    %|  ]|
           },
         )

data/spec/integration/rspec/match_matcher_spec.rb

@@ -855,7 +855,8 @@ RSpec.describe "Integration with RSpec's #match matcher", type: :integration do
               # actual_line   %|+   zip: "90382",|  # FIXME
               expected_line %|-   zip: "91234"|
               actual_line   %|+   zip: "90382"|
-              expected_line %|-   something_else: "blah"|
+              # expected_line %|-   something_else: "blah"|  # TODO
+              expected_line %|-   something_else: "blah",|
               plain_line    %|  }>|
             },
           )
@@ -971,7 +972,8 @@ RSpec.describe "Integration with RSpec's #match matcher", type: :integration do
             # expected_line %|-     zip: "91234",|  # FIXME
             expected_line %|-     zip: "91234"|
             actual_line   %|+     zip: "90382"|
-            expected_line %|-     something_else: "blah"|
+            # expected_line %|-     something_else: "blah"|  # TODO
+            expected_line %|-     something_else: "blah",|
             plain_line    %|    }>|
             plain_line    %|  }|
           },
@@ -1065,7 +1067,8 @@ RSpec.describe "Integration with RSpec's #match matcher", type: :integration do
             diff: proc {
               plain_line    %|  [|
               actual_line   %|+   "b",|
-              expected_line %|-   "a"|
+              # expected_line %|-   "a"|  # TODO
+              expected_line %|-   "a",|
               plain_line    %|  ]|
             },
           )
@@ -1143,7 +1146,8 @@ RSpec.describe "Integration with RSpec's #match matcher", type: :integration do
               actual_line   %|+   "eggs",|
               actual_line   %|+   "cheese",|
               actual_line   %|+   "English muffins",|
-              expected_line %|-   "bread"|
+              # expected_line %|-   "bread"|  # TODO
+              expected_line %|-   "bread",|
               plain_line    %|  ]|
             },
           )
@@ -1232,7 +1236,8 @@ RSpec.describe "Integration with RSpec's #match matcher", type: :integration do
               plain_line    %|      "milk",|
               actual_line   %|+     "toast",|
               actual_line   %|+     "eggs",|
-              expected_line %|-     "bread"|
+              # expected_line %|-     "bread"|  # TODO
+              expected_line %|-     "bread",|
               plain_line    %|    ]|
               plain_line    %|  }|
             },

data/spec/spec_helper.rb

@@ -43,6 +43,7 @@ Dir.glob(File.expand_path("support/**/*.rb", __dir__)).
   end
 
 RSpec.configure do |config|
+  config.include(SuperDiff::UnitTests, type: :unit)
   config.include(SuperDiff::IntegrationTests, type: :integration)
 
   config.expect_with :rspec do |expectations|

data/spec/support/command_runner.rb

@@ -5,24 +5,6 @@ require "shellwords"
 require "timeout"
 
 class CommandRunner
-  module OutputHelpers
-    def self.bookended(text)
-      divider("START") + text + "\n" + divider("END")
-    end
-
-    def self.divider(title = "")
-      total_length = 72
-      start_length = 3
-
-      string = ""
-      string << ("-" * start_length)
-      string << title
-      string << "-" * (total_length - start_length - title.length)
-      string << "\n"
-      string
-    end
-  end
-
   class CommandFailedError < StandardError
     def self.create(command:, exit_status:, output:, message: nil)
       allocate.tap do |error|
@@ -49,7 +31,11 @@ Command #{command.inspect} failed, exiting with status #{exit_status}.
       if output
         message << <<-MESSAGE
 Output:
-#{OutputHelpers.divider("START") + output + OutputHelpers.divider("END")}
+#{
+  SuperDiff::Test::OutputHelpers.divider("START") +
+  output +
+  SuperDiff::Test::OutputHelpers.divider("END")
+}
         MESSAGE
       end
 
@@ -83,7 +69,11 @@ Command #{formatted_command.inspect} timed out after #{timeout} seconds.
       if output
         message << <<-MESSAGE
 Output:
-#{OutputHelpers.divider("START") + output + OutputHelpers.divider("END")}
+#{
+  SuperDiff::Test::OutputHelpers.divider("START") +
+  output +
+  SuperDiff::Test::OutputHelpers.divider("END")
+}
         MESSAGE
       end
 
@@ -120,9 +110,9 @@ Output:
     @env = extract_env_from(@options)
 
     @process = ChildProcess.build(*command)
-    # @env.each do |key, value|
-      # @process.environment[key] = value
-    # end
+    @env.each do |key, value|
+      @process.environment[key] = value
+    end
     @process.io.stdout = @process.io.stderr = @writer
 
     @wrapper = -> (block) { block.call }
@@ -250,9 +240,9 @@ Output:
 
     debug do
       "\n" +
-        OutputHelpers.divider("START") +
+        SuperDiff::Test::OutputHelpers.divider("START") +
         output +
-        OutputHelpers.divider("END")
+        SuperDiff::Test::OutputHelpers.divider("END")
     end
   end