super_diff 0.4.2 → 0.6.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

@@ -15,17 +15,17 @@ 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 {
               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
-            }
+            },
           )
 
           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
-        PROGRAM
+        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
+        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/spec_helper.rb

@@ -8,6 +8,8 @@ begin
 rescue LoadError
 end
 
+require "pp"
+
 #---
 
 require_relative "../support/current_bundle"
@@ -18,26 +20,25 @@ 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::IntegrationTests, type: :integration)
@@ -65,6 +66,14 @@ RSpec.configure do |config|
 
   config.order = :random
   Kernel.srand config.seed
+
+  if ENV["CI"] == "true"
+    config.color_mode = :on
+  end
 end
 
-require "pp"
+if active_record_available
+  require "super_diff/rspec-rails"
+else
+  require "super_diff/rspec"
+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,28 @@ 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
-    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
+      TestPrograms::RSpecActiveRecord.new(test, color_enabled: color_enabled)
     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
+    def make_rspec_active_support_program(test, color_enabled:)
+      TestPrograms::RSpecActiveSupport.new(test, color_enabled: color_enabled)
     end
 
-    def describe_block_including(test)
-      <<~PROGRAM
-        RSpec.describe "test" do
-          it "passes" do
-        #{reindent(test, level: 2)}
-          end
-        end
-      PROGRAM
+    def make_rspec_rails_test_program(test, color_enabled:)
+      TestPrograms::RSpecRails.new(test, color_enabled: color_enabled)
     end
 
     def build_expected_output(
@@ -179,9 +103,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
@@ -41,20 +36,24 @@ 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) +
             "\n" +
             "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?