super_diff 0.4.1 → 0.5.3

data/spec/integration/rspec/include_matcher_spec.rb

@@ -214,9 +214,9 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
               alpha_line %|-   city: "Hill Valley",|
               beta_line  %|+   city: "Burbank",|
               # FIXME
-              # plain_line %|    zip: "90210",|
-              plain_line %|    zip: "90210"|
+              # alpha_line %|-   state: "CA",|
               alpha_line %|-   state: "CA"|
+              plain_line %|    zip: "90210"|
               plain_line %|  }|
             },
           )

data/spec/integration/rspec/match_array_matcher_spec.rb

@@ -369,4 +369,46 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
       end
     end
   end
+
+  context "when the input value is a string" do
+    it "produces the correct failure message when used in the positive" do
+      as_both_colored_and_uncolored do |color_enabled|
+        snippet = <<~TEST.strip
+          expected = "Einie"
+          actual = ["Marty", "Jennifer", "Doc"]
+          expect(actual).to match_array(expected)
+        TEST
+        program = make_plain_test_program(
+          snippet,
+          color_enabled: color_enabled,
+        )
+
+        expected_output = build_expected_output(
+          color_enabled: color_enabled,
+          snippet: %|expect(actual).to match_array(expected)|,
+          expectation: proc {
+            line do
+              plain "Expected "
+              beta %|["Marty", "Jennifer", "Doc"]|
+              plain " to match array with "
+              alpha %|"Einie"|
+              plain "."
+            end
+          },
+          diff: proc {
+            plain_line %|  [|
+            plain_line %|    "Marty",|
+            plain_line %|    "Jennifer",|
+            plain_line %|    "Doc",|
+            alpha_line %|-   "Einie"|
+            plain_line %|  ]|
+          },
+        )
+
+        expect(program).
+          to produce_output_when_run(expected_output).
+          in_color(color_enabled)
+      end
+    end
+  end
 end

data/spec/integration/rspec/unhandled_errors_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
 
           expected_output = build_expected_output(
             color_enabled: color_enabled,
-            snippet: %|raise "Some kind of error or whatever\\n\\nThis is another line"|,
+            snippet: snippet,
             newline_before_expectation: true,
             indentation: 5,
             expectation: proc {
@@ -25,7 +25,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
                 newline
                 plain_line "This is another line"
               end
-            }
+            },
           )
 
           expect(program).
@@ -48,7 +48,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
 
           expected_output = build_expected_output(
             color_enabled: color_enabled,
-            snippet: %|raise "Some kind of error or whatever"|,
+            snippet: snippet,
             newline_before_expectation: true,
             indentation: 5,
             expectation: proc {
@@ -56,7 +56,7 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
               indent by: 2 do
                 red_line "Some kind of error or whatever"
               end
-            }
+            },
           )
 
           expect(program).
@@ -67,23 +67,79 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
     end
   end
 
-  context "when multiple exception occur" do
-    it "highlights the first line in red, and then leaves the rest of the message alone" do
+  context "when multiple exceptions occur" do
+    it "displays all exceptions, and for each exception, highlights the first line in red and leaves the rest of the message alone" do
       as_both_colored_and_uncolored do |color_enabled|
-        program = <<~PROGRAM.strip
-          #{set_up_with("super_diff/rspec", color_enabled: color_enabled)}
+        snippet = <<~TEST.strip
+          raise "Some kind of error or whatever\\n\\nThis is another line"
+        TEST
+        code = <<~CODE
           RSpec.describe "test" do
             after(:each) do
-              raise "Some kind of after error or whatever\\n\\nThis is another line"
+              #{snippet}
             end
+
             it "passes" do
-              raise "Some kind of error or whatever\\n\\nThis is another line"
+              #{snippet}
+            end
+          end
+        CODE
+
+        program = make_plain_test_program(
+          code,
+          color_enabled: color_enabled,
+          preserve_as_whole_file: true,
+        )
+
+        expected_output1 = colored(color_enabled: color_enabled) do
+          indent by: 5 do
+            line do
+              plain "1.1) "
+              bold "Failure/Error: "
+              plain snippet
+            end
+
+            newline
+
+            indent by: 5 do
+              red_line "RuntimeError:"
+              indent by: 2 do
+                red_line "Some kind of error or whatever"
+                newline
+                line "This is another line"
+              end
+            end
+          end
+        end
+
+        expected_output2 = colored(color_enabled: color_enabled) do
+          indent by: 5 do
+            line do
+              plain "1.2) "
+              bold "Failure/Error: "
+              plain snippet
+            end
+
+            newline
+
+            indent by: 5 do
+              red_line "RuntimeError:"
+              indent by: 2 do
+                red_line "Some kind of error or whatever"
+                newline
+                line "This is another line"
+              end
             end
           end
-        PROGRAM
+        end
+
+        expect(program).
+          to produce_output_when_run(expected_output1).
+          in_color(color_enabled)
 
         expect(program).
-          to produce_output_when_run('Some kind of after error or whatever')
+          to produce_output_when_run(expected_output2).
+          in_color(color_enabled)
       end
     end
   end

data/spec/support/command_runner.rb

@@ -120,6 +120,9 @@ Output:
     @env = extract_env_from(@options)
 
     @process = ChildProcess.build(*command)
+    # @env.each do |key, value|
+      # @process.environment[key] = value
+    # end
     @process.io.stdout = @process.io.stderr = @writer
 
     @wrapper = -> (block) { block.call }

data/spec/support/integration/helpers.rb

@@ -8,104 +8,24 @@ module SuperDiff
       end
     end
 
-    def make_plain_test_program(test, color_enabled:)
-      <<~PROGRAM
-        #{set_up_with("super_diff/rspec", color_enabled: color_enabled)}
-        #{describe_block_including(test)}
-      PROGRAM
+    def make_plain_test_program(
+      test,
+      color_enabled:,
+      preserve_as_whole_file: false
+    )
+      TestPrograms::Plain.new(
+        test,
+        color_enabled: color_enabled,
+        preserve_as_whole_file: preserve_as_whole_file,
+      )
     end
 
     def make_rspec_active_record_program(test, color_enabled:)
-      <<~PROGRAM
-        #{
-          set_up_active_record_around do
-            set_up_with(
-              "super_diff/rspec", "super_diff/active_record",
-              color_enabled: color_enabled
-            )
-          end
-        }
-        #{describe_block_including(test)}
-      PROGRAM
+      TestPrograms::RspecActiveRecord.new(test, color_enabled: color_enabled)
     end
 
     def make_rspec_rails_test_program(test, color_enabled:)
-      <<~PROGRAM
-        #{
-          set_up_active_record_around do
-            set_up_with("super_diff/rspec-rails", color_enabled: color_enabled)
-          end
-        }
-        #{describe_block_including(test)}
-      PROGRAM
-    end
-
-    def set_up_active_record_around(&block)
-      <<~PROGRAM
-        require "active_record"
-
-        ActiveRecord::Base.establish_connection(
-          adapter: "sqlite3",
-          database: ":memory:"
-        )
-
-        RSpec.configuration do |config|
-          config.before do
-            SuperDiff::Test::Models::ActiveRecord::Person.delete_all
-            SuperDiff::Test::Models::ActiveRecord::ShippingAddress.delete_all
-          end
-        end
-
-        #{block.call}
-
-        Dir.glob(SUPPORT_DIR.join("models/active_record/*.rb")).each do |path|
-          require path
-        end
-      PROGRAM
-    end
-
-    def set_up_with(*libraries, color_enabled:)
-      <<~SETUP
-        PROJECT_DIRECTORY = Pathname.new("#{PROJECT_DIRECTORY}")
-        SUPPORT_DIR = PROJECT_DIRECTORY.join("spec/support")
-        INSIDE_INTEGRATION_TEST = true
-
-        $LOAD_PATH.unshift(PROJECT_DIRECTORY.join("lib"))
-        #\$LOAD_PATH.unshift(PROJECT_DIRECTORY)
-
-        begin
-          require "pry-byebug"
-        rescue LoadError
-          require "pry-nav"
-        end
-
-        module SuperDiff
-          module IntegrationTests; end
-        end
-
-        RSpec.configure do |config|
-          config.color_mode = :#{color_enabled ? "on" : "off"}
-          config.include SuperDiff::IntegrationTests
-        end
-
-#{libraries.map { |library| %(        require "#{library}") }.join("\n")}
-
-        Dir.glob(SUPPORT_DIR.join("{models,matchers}/*.rb")).each do |path|
-          require path
-        end
-
-        require SUPPORT_DIR.join("integration/matchers")
-      SETUP
-    end
-
-    def describe_block_including(test)
-      <<~PROGRAM
-        RSpec.describe "test" do
-          it "passes" do
-        #{reindent(test, level: 2)}
-          end
-        end
-      PROGRAM
+      TestPrograms::RspecRails.new(test, color_enabled: color_enabled)
     end
 
     def build_expected_output(
@@ -179,9 +99,5 @@ module SuperDiff
     def colored(color_enabled: true, &block)
       SuperDiff::Helpers.style(color_enabled: color_enabled, &block).to_s.chomp
     end
-
-    def reindent(code, level: 0)
-      code.strip.split("\n").map { |line| ("  " * level) + line }.join("\n")
-    end
   end
 end

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

@@ -5,11 +5,8 @@ module SuperDiff
     end
 
     class ProduceOutputWhenRunMatcher
-      PROJECT_DIRECTORY = Pathname.new("../../../../../").expand_path(__FILE__)
-      TEMP_DIRECTORY = PROJECT_DIRECTORY.join("tmp")
-
       def initialize(expected_output)
-        @expected_output = expected_output.to_s.strip
+        @expected_output = expected_output.to_s
         @output_processor = nil
         @expect_output_to_contain_color = nil
       end
@@ -25,9 +22,7 @@ module SuperDiff
       end
 
       def matches?(program)
-        @program = program.strip
-
-        TEMP_DIRECTORY.mkpath
+        @program = program
 
         output_matches? && presence_of_color_matches?
       end
@@ -48,13 +43,17 @@ module SuperDiff
             "Actual output:\n\n" +
             CommandRunner::OutputHelpers.bookended(actual_output)
 
-          ::RSpec::Matchers::ExpectedsForMultipleDiffs.
-            from(expected_output).
-            message_with_diff(
-              message,
-              ::RSpec::Expectations.differ,
-              actual_output,
-            )
+          if ["1", "true"].include?(ENV["SHOW_DIFF"])
+            ::RSpec::Matchers::ExpectedsForMultipleDiffs.
+              from(expected_output).
+              message_with_diff(
+                message,
+                ::RSpec::Expectations.differ,
+                actual_output,
+              )
+          else
+            message
+          end
         end
       end
 
@@ -77,7 +76,7 @@ module SuperDiff
 
       def actual_output
         @_actual_output ||= begin
-          output = run_command.output.strip
+          output = program.run.output.strip
 
           if output_processor
             output.gsub!(output_processor[0], output_processor[1])
@@ -87,20 +86,6 @@ module SuperDiff
         end
       end
 
-      def run_command
-        CommandRunner.run(
-          "rspec --options /tmp/dummy-rspec-config",
-          tempfile.to_s,
-          env: { "DISABLE_PRY" => "true" },
-        )
-      end
-
-      def tempfile
-        @_tempfile =
-          TEMP_DIRECTORY.join("integration_spec.rb").
-            tap { |tempfile| tempfile.write(program) }
-      end
-
       def presence_of_color_matches?
         @expect_output_to_contain_color.nil? ||
           output_has_color? == expect_output_to_contain_color?

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

@@ -0,0 +1,120 @@
+module SuperDiff
+  module IntegrationTests
+    module TestPrograms
+      class Base
+        extend AttrExtras.mixin
+
+        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)
+          @code = code.strip
+          @color_enabled = color_enabled
+          @preserve_as_whole_file = preserve_as_whole_file
+        end
+
+        def run
+          result_of_command
+        end
+
+        protected
+
+        def test_plan_prelude
+          ""
+        end
+
+        def test_plan_command
+          raise NotImplementedError
+        end
+
+        private
+
+        attr_query :color_enabled?
+        attr_query :preserve_as_whole_file?
+
+        def result_of_command
+          @_result_of_command ||=
+            if zeus_running?
+              Bundler.with_unbundled_env { CommandRunner.run(*command) }
+            else
+              CommandRunner.run(*command)
+            end
+        end
+
+        def command
+          if ENV["RAILS_ENV"]
+            raise "RAILS_ENV is being set somehow?!"
+          end
+
+          if zeus_running?
+            ["zeus", test_plan_command, color_option, tempfile.to_s]
+          else
+            [
+              "rspec",
+              "--options",
+              "/tmp/dummy-rspec-config",
+              tempfile.to_s,
+            ]
+          end
+        end
+
+        def zeus_running?
+          PROJECT_DIRECTORY.join(".zeus.sock").exist?
+        end
+
+        def color_option
+          color_enabled ? "--color" : "--no-color"
+        end
+
+        def tempfile
+          @_tempfile ||= begin
+            TEMP_DIRECTORY.mkpath
+            TEMP_DIRECTORY.join("integration_spec.rb").tap do |file|
+              file.write(program)
+            end
+          end
+        end
+
+        def program
+          if zeus_running?
+            minimal_program
+          else
+            <<~PROGRAM
+              require "#{PROJECT_DIRECTORY.join("support/test_plan.rb")}"
+
+              test_plan = TestPlan.new(
+                using_outside_of_zeus: true,
+                color_enabled: #{color_enabled?}
+              )
+              test_plan.boot
+              #{test_plan_prelude}
+              test_plan.#{test_plan_command}
+
+              #{minimal_program}
+            PROGRAM
+          end
+        end
+
+        def minimal_program
+          if preserve_as_whole_file?
+            code
+          else
+            <<~PROGRAM
+              RSpec.describe "test" do
+                it "passes" do
+                  #{reindent(code, level: 2)}
+                end
+              end
+            PROGRAM
+          end
+        end
+
+        def reindent(code, level: 0)
+          code.strip.split("\n").map { |line| ("  " * level) + line }.join("\n")
+        end
+      end
+    end
+  end
+end