super_diff 0.6.2 → 0.9.0

data/spec/support/integration/matchers/produce_output_when_run_matcher.rb

@@ -12,7 +12,7 @@ module SuperDiff
       end
 
       def removing_object_ids
-        first_replacing(/#<([\w:]+):0x[a-z0-9]+(.*?)>/, '#<\1\2>')
+        first_replacing(/#<([\w:]+):0x[a-f0-9]+/, '#<\1')
         self
       end
 
@@ -38,10 +38,10 @@ module SuperDiff
           message =
             "Expected test to produce #{expect_output_to_contain_color? ? "colored" : "uncolored"} output, but it did not.\n\n" +
             "Expected output to contain:\n\n" +
-            CommandRunner::OutputHelpers.bookended(expected_output) +
+            SuperDiff::Test::OutputHelpers.bookended(expected_output) +
             "\n" +
             "Actual output:\n\n" +
-            CommandRunner::OutputHelpers.bookended(actual_output)
+            SuperDiff::Test::OutputHelpers.bookended(actual_output)
 
           if ["1", "true"].include?(ENV["SHOW_DIFF"])
             ::RSpec::Matchers::ExpectedsForMultipleDiffs.

data/spec/support/integration/test_programs/base.rb

@@ -1,4 +1,5 @@
 require "attr_extras/explicit"
+require "json"
 
 module SuperDiff
   module IntegrationTests
@@ -9,11 +10,15 @@ module SuperDiff
         PROJECT_DIRECTORY = Pathname.new("../../../..").expand_path(__dir__)
         TEMP_DIRECTORY = PROJECT_DIRECTORY.join("tmp")
 
-        attr_private :code, :color_enabled, :preserve_as_whole_file
-
-        def initialize(code, color_enabled:, preserve_as_whole_file: false)
+        def initialize(
+          code,
+          color_enabled:,
+          configuration: {},
+          preserve_as_whole_file: false
+        )
           @code = code.strip
           @color_enabled = color_enabled
+          @configuration = configuration
           @preserve_as_whole_file = preserve_as_whole_file
         end
 
@@ -33,15 +38,27 @@ module SuperDiff
 
         private
 
-        attr_query :color_enabled?
-        attr_query :preserve_as_whole_file?
+        attr_reader :code, :configuration
+
+        def color_enabled?
+          @color_enabled
+        end
+
+        def preserve_as_whole_file?
+          @preserve_as_whole_file
+        end
 
         def result_of_command
           @_result_of_command ||=
             if zeus_running?
-              Bundler.with_unbundled_env { CommandRunner.run(*command) }
+              Bundler.with_unbundled_env do
+                CommandRunner.run(Shellwords.join(command))
+              end
             else
-              CommandRunner.run(*command)
+              CommandRunner.run(
+                Shellwords.join(command),
+                env: { 'DISABLE_PRY' => 'true' },
+              )
             end
         end
 
@@ -51,7 +68,15 @@ module SuperDiff
           end
 
           if zeus_running?
-            ["zeus", test_plan_command, color_option, tempfile.to_s]
+            [
+              "zeus",
+              test_plan_command,
+              color_option,
+              "--no-pry",
+              tempfile.to_s,
+              "--configuration",
+              JSON.generate(configuration),
+            ]
           else
             [
               "rspec",
@@ -67,7 +92,7 @@ module SuperDiff
         end
 
         def color_option
-          color_enabled ? "--color" : "--no-color"
+          color_enabled? ? "--color" : "--no-color"
         end
 
         def tempfile
@@ -88,7 +113,8 @@ module SuperDiff
 
               test_plan = TestPlan.new(
                 using_outside_of_zeus: true,
-                color_enabled: #{color_enabled?}
+                color_enabled: #{color_enabled?.inspect},
+                configuration: #{configuration.inspect}
               )
               test_plan.boot
               #{test_plan_prelude}

data/spec/support/shared_examples/active_record.rb

@@ -372,7 +372,7 @@ shared_examples_for "integration with ActiveRecord" do
             expectation: proc {
               line do
                 plain    %|Expected |
-                actual   %|[#<SuperDiff::Test::Models::ActiveRecord::Query @results=#<ActiveRecord::Relation [#<SuperDiff::Test::Models::ActiveRecord::Person id: 1, name: "Murphy", age: 20>]>>]|
+                actual   %|[#<SuperDiff::Test::Models::ActiveRecord::Query @results=#<ActiveRecord::Relation [#<SuperDiff::Test::Models::ActiveRecord::Person id: 1, age: 20, name: "Murphy">]>>]|
               end
 
               line do
@@ -389,7 +389,8 @@ shared_examples_for "integration with ActiveRecord" do
               # expected_line %|-         age: 19,|  # TODO
               expected_line %|-         age: 19|
               actual_line   %|+         age: 20,|
-              expected_line %|-         name: "John"|
+              # expected_line %|-         name: "John"|  # TODO
+              expected_line %|-         name: "John",|
               actual_line   %|+         name: "Murphy"|
               plain_line    %|        }>|
               plain_line    %|      ]>|

data/spec/support/shared_examples/active_support.rb

@@ -0,0 +1,65 @@
+shared_examples_for "integration with ActiveSupport" do
+  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    %|  #<Time {|
+            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
+end