super_diff 0.5.3 → 0.8.0

data/spec/integration/rspec/third_party_matcher_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
                 red_line   "Here is the next line."
                 plain_line "  This part is indented, for whatever reason. It just kinda keeps"
                 plain_line "  going until we finish saying whatever it is we want to say."
-              }
+              },
             )
 
             expect(program).
@@ -50,10 +50,10 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
                 snippet: %|expect(:anything).to fail_with_paragraphed_failure_message|,
                 newline_before_expectation: true,
                 expectation: proc {
-                  red_line "This is a message that spans multiple paragraphs."
+                  red_line   "This is a message that spans multiple paragraphs."
                   newline
                   plain_line "Here is the next paragraph."
-                }
+                },
               )
 
               expect(program).
@@ -81,7 +81,7 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
                 expectation: proc {
                   red_line "This is a message that spans multiple lines."
                   red_line "Here is the next line."
-                }
+                },
               )
 
               expect(program).
@@ -142,7 +142,7 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
                 red_line   "Here is the next line."
                 plain_line "  This part is indented, for whatever reason. It just kinda keeps"
                 plain_line "  going until we finish saying whatever it is we want to say."
-              }
+              },
             )
 
             expect(program).
@@ -171,8 +171,8 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
                 expectation: proc {
                   red_line "This is a message that spans multiple paragraphs."
                   newline
-                  plain_line "Here is the next paragraph."
-                }
+                  plain_line    "Here is the next paragraph."
+                },
               )
 
               expect(program).
@@ -228,7 +228,7 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
             snippet: %|expect(:anything).not_to pass_with_singleline_failure_message|,
             expectation: proc {
               red_line "This is a message that spans only one line."
-            }
+            },
           )
 
           expect(program).

data/spec/integration/rspec/unhandled_errors_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
             expectation: proc {
               red_line "RuntimeError:"
               indent by: 2 do
-                red_line "Some kind of error or whatever"
+                red_line   "Some kind of error or whatever"
                 newline
                 plain_line "This is another line"
               end
@@ -95,7 +95,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
           indent by: 5 do
             line do
               plain "1.1) "
-              bold "Failure/Error: "
+              bold  "Failure/Error: "
               plain snippet
             end
 
@@ -106,7 +106,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
               indent by: 2 do
                 red_line "Some kind of error or whatever"
                 newline
-                line "This is another line"
+                line     "This is another line"
               end
             end
           end
@@ -116,7 +116,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
           indent by: 5 do
             line do
               plain "1.2) "
-              bold "Failure/Error: "
+              bold  "Failure/Error: "
               plain snippet
             end
 
@@ -127,7 +127,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
               indent by: 2 do
                 red_line "Some kind of error or whatever"
                 newline
-                line "This is another line"
+                line     "This is another line"
               end
             end
           end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require "pp"
+
 begin
   require "pry-byebug"
 rescue LoadError
@@ -8,6 +10,8 @@ begin
 rescue LoadError
 end
 
+require "climate_control"
+
 #---
 
 require_relative "../support/current_bundle"
@@ -18,28 +22,28 @@ SuperDiff::CurrentBundle.instance.assert_appraisal!
 
 begin
   require "active_record"
+
   active_record_available = true
-rescue LoadError
-  active_record_available = false
-end
 
-if active_record_available
   ActiveRecord::Base.establish_connection(
     adapter: "sqlite3",
     database: ":memory:",
   )
-
-  require "super_diff/rspec-rails"
-else
-  require "super_diff/rspec"
+rescue LoadError
+  active_record_available = false
 end
 
-Dir.glob(File.expand_path("support/**/*.rb", __dir__)).each do |file|
-  next if !active_record_available && file.include?('models/active_record')
-  require file
-end
+Dir.glob(File.expand_path("support/**/*.rb", __dir__)).
+  sort.
+  reject do |file|
+    file.include?("/models/active_record/") && !active_record_available
+  end.
+  each do |file|
+    require file
+  end
 
 RSpec.configure do |config|
+  config.include(SuperDiff::UnitTests, type: :unit)
   config.include(SuperDiff::IntegrationTests, type: :integration)
 
   config.expect_with :rspec do |expectations|
@@ -65,6 +69,22 @@ RSpec.configure do |config|
 
   config.order = :random
   Kernel.srand config.seed
+
+  if ENV["CI"] == "true"
+    config.color_mode = :on
+  end
 end
 
-require "pp"
+require "warnings_logger"
+$VERBOSE = true
+WarningsLogger.configure do |config|
+  config.project_name = "super_diff"
+  config.project_directory = Pathname.new("..").expand_path(__dir__)
+end
+WarningsLogger.enable
+
+if active_record_available
+  require "super_diff/rspec-rails"
+else
+  require "super_diff/rspec"
+end

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
 

data/spec/support/helpers.rb

@@ -0,0 +1,21 @@
+module SuperDiff
+  module Test
+    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
+  end
+end

data/spec/support/integration/helpers.rb

@@ -11,21 +11,27 @@ module SuperDiff
     def make_plain_test_program(
       test,
       color_enabled:,
+      configuration: {},
       preserve_as_whole_file: false
     )
       TestPrograms::Plain.new(
         test,
         color_enabled: color_enabled,
+        configuration: configuration,
         preserve_as_whole_file: preserve_as_whole_file,
       )
     end
 
     def make_rspec_active_record_program(test, color_enabled:)
-      TestPrograms::RspecActiveRecord.new(test, color_enabled: color_enabled)
+      TestPrograms::RSpecActiveRecord.new(test, color_enabled: color_enabled)
+    end
+
+    def make_rspec_active_support_program(test, color_enabled:)
+      TestPrograms::RSpecActiveSupport.new(test, color_enabled: color_enabled)
     end
 
     def make_rspec_rails_test_program(test, color_enabled:)
-      TestPrograms::RspecRails.new(test, color_enabled: color_enabled)
+      TestPrograms::RSpecRails.new(test, color_enabled: color_enabled)
     end
 
     def build_expected_output(

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
 
@@ -36,12 +36,12 @@ module SuperDiff
             "."
         else
           message =
-            "Expected test to produce output, but it did not.\n\n" +
+            "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,3 +1,6 @@
+require "attr_extras/explicit"
+require "json"
+
 module SuperDiff
   module IntegrationTests
     module TestPrograms
@@ -7,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
 
@@ -31,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
 
@@ -49,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",
@@ -65,7 +92,7 @@ module SuperDiff
         end
 
         def color_option
-          color_enabled ? "--color" : "--no-color"
+          color_enabled? ? "--color" : "--no-color"
         end
 
         def tempfile
@@ -86,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/integration/test_programs/rspec_active_record.rb

@@ -1,7 +1,7 @@
 module SuperDiff
   module IntegrationTests
     module TestPrograms
-      class RspecActiveRecord < Base
+      class RSpecActiveRecord < Base
         protected
 
         def test_plan_prelude

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

@@ -0,0 +1,17 @@
+module SuperDiff
+  module IntegrationTests
+    module TestPrograms
+      class RSpecActiveSupport < Base
+        protected
+
+        def test_plan_prelude
+          "test_plan.boot_active_support"
+        end
+
+        def test_plan_command
+          "run_rspec_active_support_test"
+        end
+      end
+    end
+  end
+end