super_diff 0.9.0 → 0.11.0

data/spec/integration/rspec/third_party_matcher_spec.rb

@@ -9,26 +9,27 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
             snippet = <<~TEST.strip
               expect(:anything).to fail_with_indented_multiline_failure_message
             TEST
-            program = make_plain_test_program(
-              snippet,
-              color_enabled: color_enabled,
-            )
+            program =
+              make_plain_test_program(snippet, color_enabled: color_enabled)
 
-            expected_output = build_expected_output(
-              color_enabled: color_enabled,
-              snippet: %|expect(:anything).to fail_with_indented_multiline_failure_message|,
-              newline_before_expectation: true,
-              expectation: proc {
-                red_line   "This is a message that spans multiple lines."
-                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."
-              },
-            )
+            expected_output =
+              build_expected_output(
+                color_enabled: color_enabled,
+                snippet:
+                  "expect(:anything).to fail_with_indented_multiline_failure_message",
+                newline_before_expectation: true,
+                expectation:
+                  proc do
+                    red_line "This is a message that spans multiple lines."
+                    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."
+                  end
+              )
 
-            expect(program).
-              to produce_output_when_run(expected_output).
-              in_color(color_enabled)
+            expect(program).to produce_output_when_run(
+              expected_output
+            ).in_color(color_enabled)
           end
         end
       end
@@ -40,25 +41,26 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
               snippet = <<~TEST.strip
                 expect(:anything).to fail_with_paragraphed_failure_message
               TEST
-              program = make_plain_test_program(
-                snippet,
-                color_enabled: color_enabled,
-              )
-
-              expected_output = build_expected_output(
-                color_enabled: color_enabled,
-                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."
-                  newline
-                  plain_line "Here is the next paragraph."
-                },
-              )
-
-              expect(program).
-                to produce_output_when_run(expected_output).
-                in_color(color_enabled)
+              program =
+                make_plain_test_program(snippet, color_enabled: color_enabled)
+
+              expected_output =
+                build_expected_output(
+                  color_enabled: color_enabled,
+                  snippet:
+                    "expect(:anything).to fail_with_paragraphed_failure_message",
+                  newline_before_expectation: true,
+                  expectation:
+                    proc do
+                      red_line "This is a message that spans multiple paragraphs."
+                      newline
+                      plain_line "Here is the next paragraph."
+                    end
+                )
+
+              expect(program).to produce_output_when_run(
+                expected_output
+              ).in_color(color_enabled)
             end
           end
         end
@@ -69,24 +71,25 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
               snippet = <<~TEST.strip
                 expect(:anything).to fail_with_non_indented_multiline_failure_message
               TEST
-              program = make_plain_test_program(
-                snippet,
-                color_enabled: color_enabled,
-              )
-
-              expected_output = build_expected_output(
-                color_enabled: color_enabled,
-                snippet: %|expect(:anything).to fail_with_non_indented_multiline_failure_message|,
-                newline_before_expectation: true,
-                expectation: proc {
-                  red_line "This is a message that spans multiple lines."
-                  red_line "Here is the next line."
-                },
-              )
-
-              expect(program).
-                to produce_output_when_run(expected_output).
-                in_color(color_enabled)
+              program =
+                make_plain_test_program(snippet, color_enabled: color_enabled)
+
+              expected_output =
+                build_expected_output(
+                  color_enabled: color_enabled,
+                  snippet:
+                    "expect(:anything).to fail_with_non_indented_multiline_failure_message",
+                  newline_before_expectation: true,
+                  expectation:
+                    proc do
+                      red_line "This is a message that spans multiple lines."
+                      red_line "Here is the next line."
+                    end
+                )
+
+              expect(program).to produce_output_when_run(
+                expected_output
+              ).in_color(color_enabled)
             end
           end
         end
@@ -99,22 +102,21 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
           snippet = <<~TEST.strip
             expect(:anything).to fail_with_singleline_failure_message
           TEST
-          program = make_plain_test_program(
-            snippet,
-            color_enabled: color_enabled,
-          )
+          program =
+            make_plain_test_program(snippet, color_enabled: color_enabled)
 
-          expected_output = build_expected_output(
-            color_enabled: color_enabled,
-            snippet: %|expect(:anything).to fail_with_singleline_failure_message|,
-            expectation: proc {
-              red_line "This is a message that spans only one line."
-            }
-          )
+          expected_output =
+            build_expected_output(
+              color_enabled: color_enabled,
+              snippet:
+                "expect(:anything).to fail_with_singleline_failure_message",
+              expectation:
+                proc { red_line "This is a message that spans only one line." }
+            )
 
-          expect(program).
-            to produce_output_when_run(expected_output).
-            in_color(color_enabled)
+          expect(program).to produce_output_when_run(expected_output).in_color(
+            color_enabled
+          )
         end
       end
     end
@@ -128,26 +130,27 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
             snippet = <<~TEST.strip
               expect(:anything).not_to pass_with_indented_multiline_failure_message
             TEST
-            program = make_plain_test_program(
-              snippet,
-              color_enabled: color_enabled,
-            )
+            program =
+              make_plain_test_program(snippet, color_enabled: color_enabled)
 
-            expected_output = build_expected_output(
-              color_enabled: color_enabled,
-              snippet: %|expect(:anything).not_to pass_with_indented_multiline_failure_message|,
-              newline_before_expectation: true,
-              expectation: proc {
-                red_line   "This is a message that spans multiple lines."
-                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."
-              },
-            )
+            expected_output =
+              build_expected_output(
+                color_enabled: color_enabled,
+                snippet:
+                  "expect(:anything).not_to pass_with_indented_multiline_failure_message",
+                newline_before_expectation: true,
+                expectation:
+                  proc do
+                    red_line "This is a message that spans multiple lines."
+                    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."
+                  end
+              )
 
-            expect(program).
-              to produce_output_when_run(expected_output).
-              in_color(color_enabled)
+            expect(program).to produce_output_when_run(
+              expected_output
+            ).in_color(color_enabled)
           end
         end
       end
@@ -159,25 +162,26 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
               snippet = <<~TEST.strip
                 expect(:anything).not_to pass_with_paragraphed_failure_message
               TEST
-              program = make_plain_test_program(
-                snippet,
-                color_enabled: color_enabled,
-              )
-
-              expected_output = build_expected_output(
-                color_enabled: color_enabled,
-                snippet: %|expect(:anything).not_to pass_with_paragraphed_failure_message|,
-                newline_before_expectation: true,
-                expectation: proc {
-                  red_line "This is a message that spans multiple paragraphs."
-                  newline
-                  plain_line    "Here is the next paragraph."
-                },
-              )
-
-              expect(program).
-                to produce_output_when_run(expected_output).
-                in_color(color_enabled)
+              program =
+                make_plain_test_program(snippet, color_enabled: color_enabled)
+
+              expected_output =
+                build_expected_output(
+                  color_enabled: color_enabled,
+                  snippet:
+                    "expect(:anything).not_to pass_with_paragraphed_failure_message",
+                  newline_before_expectation: true,
+                  expectation:
+                    proc do
+                      red_line "This is a message that spans multiple paragraphs."
+                      newline
+                      plain_line "Here is the next paragraph."
+                    end
+                )
+
+              expect(program).to produce_output_when_run(
+                expected_output
+              ).in_color(color_enabled)
             end
           end
         end
@@ -188,24 +192,25 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
               snippet = <<~TEST.strip
                 expect(:anything).not_to pass_with_non_indented_multiline_failure_message
               TEST
-              program = make_plain_test_program(
-                snippet,
-                color_enabled: color_enabled,
-              )
-
-              expected_output = build_expected_output(
-                color_enabled: color_enabled,
-                snippet: %|expect(:anything).not_to pass_with_non_indented_multiline_failure_message|,
-                newline_before_expectation: true,
-                expectation: proc {
-                  red_line "This is a message that spans multiple lines."
-                  red_line "Here is the next line."
-                }
-              )
-
-              expect(program).
-                to produce_output_when_run(expected_output).
-                in_color(color_enabled)
+              program =
+                make_plain_test_program(snippet, color_enabled: color_enabled)
+
+              expected_output =
+                build_expected_output(
+                  color_enabled: color_enabled,
+                  snippet:
+                    "expect(:anything).not_to pass_with_non_indented_multiline_failure_message",
+                  newline_before_expectation: true,
+                  expectation:
+                    proc do
+                      red_line "This is a message that spans multiple lines."
+                      red_line "Here is the next line."
+                    end
+                )
+
+              expect(program).to produce_output_when_run(
+                expected_output
+              ).in_color(color_enabled)
             end
           end
         end
@@ -218,22 +223,21 @@ RSpec.describe "Integration with a third-party matcher", type: :integration do
           snippet = <<~TEST.strip
             expect(:anything).not_to pass_with_singleline_failure_message
           TEST
-          program = make_plain_test_program(
-            snippet,
-            color_enabled: color_enabled,
-          )
+          program =
+            make_plain_test_program(snippet, color_enabled: color_enabled)
 
-          expected_output = build_expected_output(
-            color_enabled: color_enabled,
-            snippet: %|expect(:anything).not_to pass_with_singleline_failure_message|,
-            expectation: proc {
-              red_line "This is a message that spans only one line."
-            },
-          )
+          expected_output =
+            build_expected_output(
+              color_enabled: color_enabled,
+              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).
-            to produce_output_when_run(expected_output).
-            in_color(color_enabled)
+          expect(program).to produce_output_when_run(expected_output).in_color(
+            color_enabled
+          )
         end
       end
     end

data/spec/integration/rspec/unhandled_errors_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 
-RSpec.describe "Integration with RSpec and unhandled errors", type: :integration do
+RSpec.describe "Integration with RSpec and unhandled errors",
+               type: :integration do
   context "when a random exception occurs" do
     context "and the message spans multiple lines" do
       it "highlights the first line in red, and then leaves the rest of the message alone" do
@@ -8,29 +9,29 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
           snippet = <<~TEST.strip
             raise "Some kind of error or whatever\\n\\nThis is another line"
           TEST
-          program = make_plain_test_program(
-            snippet,
-            color_enabled: color_enabled,
+          program =
+            make_plain_test_program(snippet, color_enabled: color_enabled)
+
+          expected_output =
+            build_expected_output(
+              color_enabled: color_enabled,
+              snippet: snippet,
+              newline_before_expectation: true,
+              indentation: 5,
+              expectation:
+                proc do
+                  red_line "RuntimeError:"
+                  indent by: 2 do
+                    red_line "Some kind of error or whatever"
+                    newline
+                    plain_line "This is another line"
+                  end
+                end
+            )
+
+          expect(program).to produce_output_when_run(expected_output).in_color(
+            color_enabled
           )
-
-          expected_output = build_expected_output(
-            color_enabled: color_enabled,
-            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"
-                newline
-                plain_line "This is another line"
-              end
-            },
-          )
-
-          expect(program).
-            to produce_output_when_run(expected_output).
-            in_color(color_enabled)
         end
       end
     end
@@ -41,27 +42,27 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
           snippet = <<~TEST.strip
             raise "Some kind of error or whatever"
           TEST
-          program = make_plain_test_program(
-            snippet,
-            color_enabled: color_enabled,
+          program =
+            make_plain_test_program(snippet, color_enabled: color_enabled)
+
+          expected_output =
+            build_expected_output(
+              color_enabled: color_enabled,
+              snippet: snippet,
+              newline_before_expectation: true,
+              indentation: 5,
+              expectation:
+                proc do
+                  red_line "RuntimeError:"
+                  indent by: 2 do
+                    red_line "Some kind of error or whatever"
+                  end
+                end
+            )
+
+          expect(program).to produce_output_when_run(expected_output).in_color(
+            color_enabled
           )
-
-          expected_output = build_expected_output(
-            color_enabled: color_enabled,
-            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"
-              end
-            },
-          )
-
-          expect(program).
-            to produce_output_when_run(expected_output).
-            in_color(color_enabled)
         end
       end
     end
@@ -85,61 +86,64 @@ RSpec.describe "Integration with RSpec and unhandled errors", type: :integration
           end
         CODE
 
-        program = make_plain_test_program(
-          code,
-          color_enabled: color_enabled,
-          preserve_as_whole_file: true,
-        )
+        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
+        expected_output1 =
+          colored(color_enabled: color_enabled) do
+            indent by: 5 do
+              line do
+                plain "1.1) "
+                bold "Failure/Error: "
+                plain snippet
+              end
 
-            newline
+              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"
+              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
-        end
 
-        expected_output2 = colored(color_enabled: color_enabled) do
-          indent by: 5 do
-            line do
-              plain "1.2) "
-              bold  "Failure/Error: "
-              plain snippet
-            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
+              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"
+              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
-        end
 
-        expect(program).
-          to produce_output_when_run(expected_output1).
-          in_color(color_enabled)
+        expect(program).to produce_output_when_run(expected_output1).in_color(
+          color_enabled
+        )
 
-        expect(program).
-          to produce_output_when_run(expected_output2).
-          in_color(color_enabled)
+        expect(program).to produce_output_when_run(expected_output2).in_color(
+          color_enabled
+        )
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,13 +1,15 @@
 require "pp"
 
-begin
-  require "pry-byebug"
-rescue LoadError
-end
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.2")
+  begin
+    require "pry-byebug"
+  rescue LoadError
+  end
 
-begin
-  require "pry-nav"
-rescue LoadError
+  begin
+    require "pry-nav"
+  rescue LoadError
+  end
 end
 
 require "climate_control"
@@ -27,20 +29,19 @@ begin
 
   ActiveRecord::Base.establish_connection(
     adapter: "sqlite3",
-    database: ":memory:",
+    database: ":memory:"
   )
 rescue LoadError
   active_record_available = false
 end
 
-Dir.glob(File.expand_path("support/**/*.rb", __dir__)).
-  sort.
-  reject do |file|
+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
+  .each { |file| require file }
 
 RSpec.configure do |config|
   config.include(SuperDiff::UnitTests, type: :unit)
@@ -61,18 +62,17 @@ RSpec.configure do |config|
   config.disable_monkey_patching!
   config.warnings = true
 
-  if !["true", "1"].include?(ENV["CI"])
-    config.default_formatter = "documentation"
-  end
+  config.default_formatter = "documentation" if !%w[true 1].include?(ENV["CI"])
 
   config.filter_run_excluding active_record: true unless active_record_available
+  unless defined?(ActiveSupport)
+    config.filter_run_excluding active_support: true
+  end
 
   config.order = :random
   Kernel.srand config.seed
 
-  if ENV["CI"] == "true"
-    config.color_mode = :on
-  end
+  config.color_mode = :on if ENV["CI"] == "true"
 end
 
 require "warnings_logger"