super_diff 0.10.0 → 0.11.0

data/spec/integration/rspec/have_attributes_matcher_spec.rb

@@ -8,8 +8,8 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
         it "produces the correct output when used in the positive" do
           as_both_colored_and_uncolored do |color_enabled|
             snippet = <<~TEST.strip
-              expected = { name: "b" }
               actual = SuperDiff::Test::Person.new(name: "a", age: 9)
+              expected = { name: "b" }
               expect(actual).to have_attributes(expected)
             TEST
             program =
@@ -49,8 +49,8 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
         it "produces the correct output when used in the negative" do
           as_both_colored_and_uncolored do |color_enabled|
             snippet = <<~TEST.strip
-              expected = { name: "a" }
               actual = SuperDiff::Test::Person.new(name: "a", age: 9)
+              expected = { name: "a" }
               expect(actual).not_to have_attributes(expected)
             TEST
             program =
@@ -83,8 +83,8 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
         it "produces the correct output" do
           as_both_colored_and_uncolored do |color_enabled|
             snippet = <<~TEST.strip
-              expected = { name: "b", foo: "bar" }
               actual = SuperDiff::Test::Person.new(name: "a", age: 9)
+              expected = { name: "b", foo: "bar" }
               expect(actual).to have_attributes(expected)
             TEST
             program =
@@ -131,12 +131,6 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
         it "produces the correct output when used in the positive" do
           as_both_colored_and_uncolored do |color_enabled|
             snippet = <<~TEST.strip
-              expected = {
-                line_1: "123 Main St.",
-                city: "Oakland",
-                state: "CA",
-                zip: "91234"
-              }
               actual = SuperDiff::Test::ShippingAddress.new(
                 line_1: "456 Ponderosa Ct.",
                 line_2: nil,
@@ -144,6 +138,12 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
                 state: "CA",
                 zip: "90382"
               )
+              expected = {
+                line_1: "123 Main St.",
+                city: "Oakland",
+                state: "CA",
+                zip: "91234"
+              }
               expect(actual).to have_attributes(expected)
             TEST
             program =
@@ -189,19 +189,19 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
         it "produces the correct output when used in the negative" do
           as_both_colored_and_uncolored do |color_enabled|
             snippet = <<~TEST.strip
-              expected = {
+              actual = SuperDiff::Test::ShippingAddress.new(
                 line_1: "123 Main St.",
+                line_2: nil,
                 city: "Oakland",
                 state: "CA",
                 zip: "91234"
-              }
-              actual = SuperDiff::Test::ShippingAddress.new(
+              )
+              expected = {
                 line_1: "123 Main St.",
-                line_2: nil,
                 city: "Oakland",
                 state: "CA",
                 zip: "91234"
-              )
+              }
               expect(actual).not_to have_attributes(expected)
             TEST
             program =
@@ -237,6 +237,13 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
         it "produces the correct output" do
           as_both_colored_and_uncolored do |color_enabled|
             snippet = <<~TEST.strip
+              actual = SuperDiff::Test::ShippingAddress.new(
+                line_1: "456 Ponderosa Ct.",
+                line_2: nil,
+                city: "Hill Valley",
+                state: "CA",
+                zip: "90382"
+              )
               expected = {
                 line_1: "123 Main St.",
                 city: "Oakland",
@@ -245,13 +252,6 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
                 foo: "bar",
                 baz: "qux"
               }
-              actual = SuperDiff::Test::ShippingAddress.new(
-                line_1: "456 Ponderosa Ct.",
-                line_2: nil,
-                city: "Hill Valley",
-                state: "CA",
-                zip: "90382"
-              )
               expect(actual).to have_attributes(expected)
             TEST
             program =
@@ -307,8 +307,8 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
     it "displays the diff as if we were comparing hashes" do
       as_both_colored_and_uncolored do |color_enabled|
         snippet = <<~TEST.strip
-          expected = { name: "Elliot", age: 32 }
           actual = {}
+          expected = { name: "Elliot", age: 32 }
           expect(actual).to have_attributes(expected)
         TEST
 
@@ -347,11 +347,12 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
       end
     end
 
-    # TODO: Add as many fuzzy matchers as we can here
-    context "that contains fuzzy matcher objects instead of an object" do
+    # TODO: Add as many RSpec matchers as we can here
+    context "that contains RSpec matchers" do
       it "displays the hash correctly" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
+            actual = {}
             expected = {
               name: "Elliot",
               shipping_address: an_object_having_attributes(
@@ -365,7 +366,6 @@ RSpec.describe "Integration with RSpec's #have_attributes matcher",
               data: a_hash_including(active: true),
               created_at: a_value_within(1).of(Time.utc(2020, 4, 9))
             }
-            actual = {}
 
             expect(actual).to have_attributes(expected)
           TEST

data/spec/integration/rspec/include_matcher_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when used in the positive" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = ["Marty", "Einie"]
             actual = ["Marty", "Jennifer", "Doc"]
+            expected = ["Marty", "Einie"]
             expect(actual).to include(*expected)
           TEST
           program =
@@ -82,18 +82,18 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when used in the positive" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = [
+            actual = [
               "Marty McFly",
               "Doc Brown",
               "Einie",
-              "Biff Tannen",
-              "George McFly",
               "Lorraine McFly"
             ]
-            actual = [
+            expected = [
               "Marty McFly",
               "Doc Brown",
               "Einie",
+              "Biff Tannen",
+              "George McFly",
               "Lorraine McFly"
             ]
             expect(actual).to include(*expected)
@@ -140,18 +140,18 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when used in the negative" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = [
+            actual = [
               "Marty McFly",
               "Doc Brown",
               "Einie",
+              "Biff Tannen",
+              "George McFly",
               "Lorraine McFly"
             ]
-            actual = [
+            expected = [
               "Marty McFly",
               "Doc Brown",
               "Einie",
-              "Biff Tannen",
-              "George McFly",
               "Lorraine McFly"
             ]
             expect(actual).not_to include(*expected)
@@ -191,8 +191,8 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when used in the positive" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = { city: "Hill Valley", state: "CA" }
             actual = { city: "Burbank", zip: "90210" }
+            expected = { city: "Hill Valley", state: "CA" }
             expect(actual).to include(expected)
           TEST
           program =
@@ -234,8 +234,8 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when used in the negative" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = { city: "Burbank" }
             actual = { city: "Burbank", zip: "90210" }
+            expected = { city: "Burbank" }
             expect(actual).not_to include(expected)
           TEST
           program =
@@ -266,8 +266,8 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when fuzzy matching" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = { number: a_kind_of(Numeric), city: /burb/i, state: "CA" }
             actual = { number: 42, city: "Burbank", zip: "90210" }
+            expected = { number: a_kind_of(Numeric), city: /burb/i, state: "CA" }
             expect(actual).to include(expected)
           TEST
           program =
@@ -309,15 +309,15 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when used in the positive" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = {
-              city: "Hill Valley",
-              zip: "90382"
-            }
             actual = {
               city: "Burbank",
               state: "CA",
               zip: "90210"
             }
+            expected = {
+              city: "Hill Valley",
+              zip: "90382"
+            }
             expect(actual).to include(expected)
           TEST
           program =
@@ -360,8 +360,8 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when used in the negative" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = { city: "Hill Valley", state: "CA" }
             actual = { city: "Hill Valley", state: "CA", zip: "90210" }
+            expected = { city: "Hill Valley", state: "CA" }
             expect(actual).not_to include(expected)
           TEST
           program =
@@ -395,12 +395,6 @@ RSpec.describe "Integration with RSpec's #include matcher",
       it "produces the correct failure message when fuzzy matching" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = {
-              number: a_kind_of(Numeric),
-              street: "Yoshie Circles",
-              city: /burb/i,
-              zip: "90382"
-            }
             actual = {
               number: 42,
               street: "Yoshie Circles",
@@ -408,6 +402,12 @@ RSpec.describe "Integration with RSpec's #include matcher",
               state: "CA",
               zip: "90210"
             }
+            expected = {
+              number: a_kind_of(Numeric),
+              street: "Yoshie Circles",
+              city: /burb/i,
+              zip: "90382"
+            }
             expect(actual).to include(expected)
           TEST
           program =

data/spec/integration/rspec/magic_metadata_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+RSpec.describe "Integration with RSpec's magic metadata", type: :integration do
+  it "includes extra_failure_lines in failure messages" do
+    as_both_colored_and_uncolored do |color_enabled|
+      snippet = <<~TEST.strip
+          RSpec.describe "test" do
+            it { expect(true).to be(false) }
+
+            after do
+              RSpec.current_example.metadata[:extra_failure_lines] = "foo\nbar"
+            end
+          end
+        TEST
+      program =
+        make_plain_test_program(
+          snippet,
+          color_enabled: color_enabled,
+          preserve_as_whole_file: true
+        )
+
+      expected_output =
+        build_expected_output(
+          color_enabled: color_enabled,
+          test_name: "test is expected to equal false",
+          snippet: "it { expect(true).to be(false) }",
+          expectation:
+            proc do
+              line do
+                plain "Expected "
+                actual "true"
+                plain " to equal "
+                expected "false"
+                plain "."
+              end
+            end,
+          extra_failure_lines:
+            proc do
+              indent by: 5 do
+                line "foo"
+                line "bar"
+              end
+            end
+        )
+
+      expect(program).to produce_output_when_run(expected_output).in_color(
+        color_enabled
+      )
+    end
+  end
+end

data/spec/integration/rspec/match_array_matcher_spec.rb

@@ -6,8 +6,8 @@ RSpec.describe "Integration with RSpec's #match_array matcher",
     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", "Marty"]
           actual = ["Marty", "Jennifer", "Doc"]
+          expected = ["Einie", "Marty"]
           expect(actual).to match_array(expected)
         TEST
         program = make_plain_test_program(snippet, color_enabled: color_enabled)
@@ -84,6 +84,12 @@ RSpec.describe "Integration with RSpec's #match_array matcher",
       it "produces the correct failure message when used in the positive" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
+            actual = [
+              "Marty McFly",
+              "Doc Brown",
+              "Einie",
+              "Lorraine McFly"
+            ]
             expected = [
               "Doc Brown",
               "Marty McFly",
@@ -91,12 +97,6 @@ RSpec.describe "Integration with RSpec's #match_array matcher",
               "George McFly",
               "Lorraine McFly"
             ]
-            actual = [
-              "Marty McFly",
-              "Doc Brown",
-              "Einie",
-              "Lorraine McFly"
-            ]
             expect(actual).to match_array(expected)
           TEST
           program =
@@ -196,6 +196,12 @@ RSpec.describe "Integration with RSpec's #match_array matcher",
       it "produces the correct failure message when used in the positive" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST
+            actual = [
+              "Marty McFly",
+              "Doc Brown",
+              "Einie",
+              "Lorraine McFly"
+            ]
             expected = [
               / Brown$/,
               "Marty McFly",
@@ -203,12 +209,6 @@ RSpec.describe "Integration with RSpec's #match_array matcher",
               /Georg McFly/,
               /Lorrain McFly/
             ]
-            actual = [
-              "Marty McFly",
-              "Doc Brown",
-              "Einie",
-              "Lorraine McFly"
-            ]
             expect(actual).to match_array(expected)
           TEST
           program =
@@ -310,20 +310,20 @@ RSpec.describe "Integration with RSpec's #match_array matcher",
       end
     end
 
-    context "and some of them are fuzzy objects" do
+    context "and some of them are RSpec matchers" do
       it "produces the correct failure message" do
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
-            expected = [
-              a_hash_including(foo: "bar"),
-              a_collection_containing_exactly("zing"),
-              an_object_having_attributes(baz: "qux"),
-            ]
             actual = [
               { foo: "bar" },
               double(baz: "qux"),
               { blargh: "riddle" }
             ]
+            expected = [
+              a_hash_including(foo: "bar"),
+              a_collection_containing_exactly("zing"),
+              an_object_having_attributes(baz: "qux"),
+            ]
             expect(actual).to match_array(expected)
           TEST
           program =
@@ -379,12 +379,12 @@ RSpec.describe "Integration with RSpec's #match_array matcher",
     end
   end
 
-  context "when the input value is a string" do
-    it "produces the correct failure message when used in the positive" do
+  context "when the input value is not an array, and especially not a value that could be turned into one" do
+    it "produces the correct failure message, as though an array had been given" do
       as_both_colored_and_uncolored do |color_enabled|
         snippet = <<~TEST.strip
-          expected = "Einie"
-          actual = ["Marty", "Jennifer", "Doc"]
+          actual = [:marty, :jennifer, :doc]
+          expected = :einie
           expect(actual).to match_array(expected)
         TEST
         program = make_plain_test_program(snippet, color_enabled: color_enabled)
@@ -397,20 +397,20 @@ RSpec.describe "Integration with RSpec's #match_array matcher",
               proc do
                 line do
                   plain "Expected "
-                  actual %|["Marty", "Jennifer", "Doc"]|
+                  actual "[:marty, :jennifer, :doc]"
                   plain " to match array with "
-                  expected %|"Einie"|
+                  expected ":einie"
                   plain "."
                 end
               end,
             diff:
               proc do
                 plain_line "  ["
-                actual_line %|+   "Marty",|
-                actual_line %|+   "Jennifer",|
-                actual_line %|+   "Doc",|
-                # expected_line %|-   "Einie"|  # TODO
-                expected_line %|-   "Einie",|
+                actual_line "+   :marty,"
+                actual_line "+   :jennifer,"
+                actual_line "+   :doc,"
+                # expected_line %|-   :einie|  # TODO
+                expected_line "-   :einie,"
                 plain_line "  ]"
               end
           )