super_diff 0.5.3 → 0.8.0

data/spec/integration/rspec/include_matcher_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
             expected = ["Marty", "Einie"]
-            actual = ["Marty", "Jennifer", "Doc"]
+            actual   = ["Marty", "Jennifer", "Doc"]
             expect(actual).to include(*expected)
           TEST
           program = make_plain_test_program(
@@ -20,21 +20,21 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
             snippet: %|expect(actual).to include(*expected)|,
             expectation: proc {
               line do
-                plain "Expected "
-                beta %|["Marty", "Jennifer", "Doc"]|
-                plain " to include "
-                alpha %|"Einie"|
-                plain "."
+                plain    %|Expected |
+                actual   %|["Marty", "Jennifer", "Doc"]|
+                plain    %| to include |
+                expected %|"Einie"|
+                plain    %|.|
               end
             },
             diff: proc {
-              plain_line %|  [|
-              plain_line %|    "Marty",|
-              plain_line %|    "Jennifer",|
-              # plain_line %|    "Doc",|   # FIXME
-              plain_line %|    "Doc"|
-              alpha_line %|-   "Einie"|
-              plain_line %|  ]|
+              plain_line    %|  [|
+              plain_line    %|    "Marty",|
+              plain_line    %|    "Jennifer",|
+              # plain_line    %|    "Doc",|   # FIXME
+              plain_line    %|    "Doc"|
+              expected_line %|-   "Einie"|
+              plain_line    %|  ]|
             },
           )
 
@@ -60,11 +60,11 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
             snippet: %|expect(values).not_to include(*values)|,
             expectation: proc {
               line do
-                plain "Expected "
-                beta %|["Marty", "Einie"]|
-                plain " not to include "
-                alpha %|"Marty" and "Einie"|
-                plain "."
+                plain    %|Expected |
+                actual   %|["Marty", "Einie"]|
+                plain    %| not to include |
+                expected %|"Marty" and "Einie"|
+                plain    %|.|
               end
             },
           )
@@ -88,7 +88,7 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
               "George McFly",
               "Lorraine McFly"
             ]
-            actual = [
+            actual   = [
               "Marty McFly",
               "Doc Brown",
               "Einie",
@@ -106,25 +106,25 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
             snippet: %|expect(actual).to include(*expected)|,
             expectation: proc {
               line do
-                plain "  Expected "
-                beta %|["Marty McFly", "Doc Brown", "Einie", "Lorraine McFly"]|
+                plain    %|  Expected |
+                actual   %|["Marty McFly", "Doc Brown", "Einie", "Lorraine McFly"]|
               end
 
               line do
-                plain "to include "
-                alpha %|"Biff Tannen" and "George McFly"|
+                plain    %|to include |
+                expected %|"Biff Tannen" and "George McFly"|
               end
             },
             diff: proc {
-              plain_line %|  [|
-              plain_line %|    "Marty McFly",|
-              plain_line %|    "Doc Brown",|
-              plain_line %|    "Einie",|
-              # plain_line %|    "Lorraine McFly",|   # FIXME
-              plain_line %|    "Lorraine McFly"|
-              alpha_line %|-   "Biff Tannen",|
-              alpha_line %|-   "George McFly"|
-              plain_line %|  ]|
+              plain_line    %|  [|
+              plain_line    %|    "Marty McFly",|
+              plain_line    %|    "Doc Brown",|
+              plain_line    %|    "Einie",|
+              # plain_line    %|    "Lorraine McFly",|   # FIXME
+              plain_line    %|    "Lorraine McFly"|
+              expected_line %|-   "Biff Tannen",|
+              expected_line %|-   "George McFly"|
+              plain_line    %|  ]|
             },
           )
 
@@ -143,7 +143,7 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
               "Einie",
               "Lorraine McFly"
             ]
-            actual = [
+            actual   = [
               "Marty McFly",
               "Doc Brown",
               "Einie",
@@ -164,13 +164,13 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
             newline_before_expectation: true,
             expectation: proc {
               line do
-                plain "      Expected "
-                beta %|["Marty McFly", "Doc Brown", "Einie", "Biff Tannen", "George McFly", "Lorraine McFly"]|
+                plain    %|      Expected |
+                actual   %|["Marty McFly", "Doc Brown", "Einie", "Biff Tannen", "George McFly", "Lorraine McFly"]|
               end
 
               line do
-                plain "not to include "
-                alpha %|"Marty McFly", "Doc Brown", "Einie", and "Lorraine McFly"|
+                plain    %|not to include |
+                expected %|"Marty McFly", "Doc Brown", "Einie", and "Lorraine McFly"|
               end
             },
           )
@@ -189,7 +189,7 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
             expected = { city: "Hill Valley", state: "CA" }
-            actual = { city: "Burbank", zip: "90210" }
+            actual   = { city: "Burbank", zip: "90210" }
             expect(actual).to include(expected)
           TEST
           program = make_plain_test_program(
@@ -202,22 +202,22 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
             snippet: %|expect(actual).to include(expected)|,
             expectation: proc {
               line do
-                plain "Expected "
-                beta %|{ city: "Burbank", zip: "90210" }|
-                plain " to include "
-                alpha %|(city: "Hill Valley", state: "CA")|
-                plain "."
+                plain    %|Expected |
+                actual   %|{ city: "Burbank", zip: "90210" }|
+                plain    %| to include |
+                expected %|(city: "Hill Valley", state: "CA")|
+                plain    %|.|
               end
             },
             diff: proc {
-              plain_line %|  {|
-              alpha_line %|-   city: "Hill Valley",|
-              beta_line  %|+   city: "Burbank",|
+              plain_line    %|  {|
+              expected_line %|-   city: "Hill Valley",|
+              actual_line   %|+   city: "Burbank",|
               # FIXME
-              # alpha_line %|-   state: "CA",|
-              alpha_line %|-   state: "CA"|
-              plain_line %|    zip: "90210"|
-              plain_line %|  }|
+              # expected_line %|-   state: "CA",|
+              expected_line %|-   state: "CA"|
+              plain_line    %|    zip: "90210"|
+              plain_line    %|  }|
             },
           )
 
@@ -231,7 +231,7 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
         as_both_colored_and_uncolored do |color_enabled|
           snippet = <<~TEST.strip
             expected = { city: "Burbank" }
-            actual = { city: "Burbank", zip: "90210" }
+            actual   = { city: "Burbank", zip: "90210" }
             expect(actual).not_to include(expected)
           TEST
           program = make_plain_test_program(
@@ -244,11 +244,11 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
             snippet: %|expect(actual).not_to include(expected)|,
             expectation: proc {
               line do
-                plain "Expected "
-                beta %|{ city: "Burbank", zip: "90210" }|
-                plain " not to include "
-                alpha %|(city: "Burbank")|
-                plain "."
+                plain    %|Expected |
+                actual   %|{ city: "Burbank", zip: "90210" }|
+                plain    %| not to include |
+                expected %|(city: "Burbank")|
+                plain    %|.|
               end
             },
           )
@@ -268,7 +268,7 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
               city: "Hill Valley",
               zip: "90382"
             }
-            actual = {
+            actual   = {
               city: "Burbank",
               state: "CA",
               zip: "90210"
@@ -285,23 +285,23 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
             snippet: %|expect(actual).to include(expected)|,
             expectation: proc {
               line do
-                plain "  Expected "
-                beta %|{ city: "Burbank", state: "CA", zip: "90210" }|
+                plain    %|  Expected |
+                actual   %|{ city: "Burbank", state: "CA", zip: "90210" }|
               end
 
               line do
-                plain "to include "
-                alpha %|(city: "Hill Valley", zip: "90382")|
+                plain    %|to include |
+                expected %|(city: "Hill Valley", zip: "90382")|
               end
             },
             diff: proc {
-              plain_line %|  {|
-              alpha_line %|-   city: "Hill Valley",|
-              beta_line  %|+   city: "Burbank",|
-              plain_line %|    state: "CA",|
-              alpha_line %|-   zip: "90382"|
-              beta_line  %|+   zip: "90210"|
-              plain_line %|  }|
+              plain_line    %|  {|
+              expected_line %|-   city: "Hill Valley",|
+              actual_line   %|+   city: "Burbank",|
+              plain_line    %|    state: "CA",|
+              expected_line %|-   zip: "90382"|
+              actual_line   %|+   zip: "90210"|
+              plain_line    %|  }|
             },
           )
 
@@ -315,7 +315,7 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
         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" }
+            actual   = { city: "Hill Valley", state: "CA", zip: "90210" }
             expect(actual).not_to include(expected)
           TEST
           program = make_plain_test_program(
@@ -329,13 +329,13 @@ RSpec.describe "Integration with RSpec's #include matcher", type: :integration d
             newline_before_expectation: true,
             expectation: proc {
               line do
-                plain "      Expected "
-                beta %|{ city: "Hill Valley", state: "CA", zip: "90210" }|
+                plain    %|      Expected |
+                actual   %|{ city: "Hill Valley", state: "CA", zip: "90210" }|
               end
 
               line do
-                plain "not to include "
-                alpha %|(city: "Hill Valley", state: "CA")|
+                plain    %|not to include |
+                expected %|(city: "Hill Valley", state: "CA")|
               end
             },
           )

data/spec/integration/rspec/match_array_matcher_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
       as_both_colored_and_uncolored do |color_enabled|
         snippet = <<~TEST.strip
           expected = ["Einie", "Marty"]
-          actual = ["Marty", "Jennifer", "Doc"]
+          actual   = ["Marty", "Jennifer", "Doc"]
           expect(actual).to match_array(expected)
         TEST
         program = make_plain_test_program(
@@ -19,22 +19,23 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
           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 " and "
-              alpha %|"Marty"|
-              plain "."
+              plain    %|Expected |
+              actual   %|["Marty", "Jennifer", "Doc"]|
+              plain    %| to match array with |
+              expected %|"Einie"|
+              plain    %| and |
+              expected %|"Marty"|
+              plain    %|.|
             end
           },
           diff: proc {
-            plain_line %|  [|
-            plain_line %|    "Marty",|
-            plain_line %|    "Jennifer",|
-            plain_line %|    "Doc",|
-            alpha_line %|-   "Einie"|
-            plain_line %|  ]|
+            plain_line    %|  [|
+            plain_line    %|    "Marty",|
+            actual_line   %|+   "Jennifer",|
+            actual_line   %|+   "Doc",|
+            # expected_line %|-   "Einie"|  # TODO
+            expected_line %|-   "Einie",|
+            plain_line    %|  ]|
           },
         )
 
@@ -60,13 +61,13 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
           snippet: %|expect(values).not_to match_array(values)|,
           expectation: proc {
             line do
-              plain "Expected "
-              beta %|["Einie", "Marty"]|
-              plain " not to match array with "
-              alpha %|"Einie"|
-              plain " and "
-              alpha %|"Marty"|
-              plain "."
+              plain    %|Expected |
+              actual   %|["Einie", "Marty"]|
+              plain    %| not to match array with |
+              expected %|"Einie"|
+              plain    %| and |
+              expected %|"Marty"|
+              plain    %|.|
             end
           },
         )
@@ -90,7 +91,7 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
               "George McFly",
               "Lorraine McFly"
             ]
-            actual = [
+            actual   = [
               "Marty McFly",
               "Doc Brown",
               "Einie",
@@ -108,32 +109,33 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
             snippet: %|expect(actual).to match_array(expected)|,
             expectation: proc {
               line do
-                plain "           Expected "
-                beta %|["Marty McFly", "Doc Brown", "Einie", "Lorraine McFly"]|
+                plain    %|           Expected |
+                actual   %|["Marty McFly", "Doc Brown", "Einie", "Lorraine McFly"]|
               end
 
               line do
-                plain "to match array with "
-                alpha %|"Doc Brown"|
-                plain ", "
-                alpha %|"Marty McFly"|
-                plain ", "
-                alpha %|"Biff Tannen"|
-                plain ", "
-                alpha %|"George McFly"|
-                plain " and "
-                alpha %|"Lorraine McFly"|
+                plain    %|to match array with |
+                expected %|"Doc Brown"|
+                plain    %|, |
+                expected %|"Marty McFly"|
+                plain    %|, |
+                expected %|"Biff Tannen"|
+                plain    %|, |
+                expected %|"George McFly"|
+                plain    %| and |
+                expected %|"Lorraine McFly"|
               end
             },
             diff: proc {
-              plain_line %|  [|
-              plain_line %|    "Marty McFly",|
-              plain_line %|    "Doc Brown",|
-              plain_line %|    "Einie",|
-              plain_line %|    "Lorraine McFly",|
-              alpha_line %|-   "Biff Tannen",|
-              alpha_line %|-   "George McFly"|
-              plain_line %|  ]|
+              plain_line    %|  [|
+              plain_line    %|    "Marty McFly",|
+              plain_line    %|    "Doc Brown",|
+              plain_line    %|    "Lorraine McFly",|
+              actual_line   %|+   "Einie",|
+              expected_line %|-   "Biff Tannen",|
+              # expected_line %|-   "George McFly"|  # TODO
+              expected_line %|-   "George McFly",|
+              plain_line    %|  ]|
             },
           )
 
@@ -165,19 +167,19 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
             newline_before_expectation: true,
             expectation: proc {
               line do
-                plain "               Expected "
-                beta %|["Marty McFly", "Doc Brown", "Einie", "Lorraine McFly"]|
+                plain    %|               Expected |
+                actual   %|["Marty McFly", "Doc Brown", "Einie", "Lorraine McFly"]|
               end
 
               line do
-                plain "not to match array with "
-                alpha %|"Marty McFly"|
-                plain ", "
-                alpha %|"Doc Brown"|
-                plain ", "
-                alpha %|"Einie"|
-                plain " and "
-                alpha %|"Lorraine McFly"|
+                plain    %|not to match array with |
+                expected %|"Marty McFly"|
+                plain    %|, |
+                expected %|"Doc Brown"|
+                plain    %|, |
+                expected %|"Einie"|
+                plain    %| and |
+                expected %|"Lorraine McFly"|
               end
             },
           )
@@ -200,7 +202,7 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
               /Georg McFly/,
               /Lorrain McFly/
             ]
-            actual = [
+            actual   = [
               "Marty McFly",
               "Doc Brown",
               "Einie",
@@ -218,33 +220,34 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
             snippet: %|expect(actual).to match_array(expected)|,
             expectation: proc {
               line do
-                plain "           Expected "
-                beta %|["Marty McFly", "Doc Brown", "Einie", "Lorraine McFly"]|
+                plain    %|           Expected |
+                actual   %|["Marty McFly", "Doc Brown", "Einie", "Lorraine McFly"]|
               end
 
               line do
-                plain "to match array with "
-                alpha %|/ Brown$/|
-                plain ", "
-                alpha %|"Marty McFly"|
-                plain ", "
-                alpha %|"Biff Tannen"|
-                plain ", "
-                alpha %|/Georg McFly/|
-                plain " and "
-                alpha %|/Lorrain McFly/|
+                plain    %|to match array with |
+                expected %|/ Brown$/|
+                plain    %|, |
+                expected %|"Marty McFly"|
+                plain    %|, |
+                expected %|"Biff Tannen"|
+                plain    %|, |
+                expected %|/Georg McFly/|
+                plain    %| and |
+                expected %|/Lorrain McFly/|
               end
             },
             diff: proc {
-              plain_line %|  [|
-              plain_line %|    "Marty McFly",|
-              plain_line %|    "Doc Brown",|
-              plain_line %|    "Einie",|
-              plain_line %|    "Lorraine McFly",|
-              alpha_line %|-   "Biff Tannen",|
-              alpha_line %|-   /Georg McFly/,|
-              alpha_line %|-   /Lorrain McFly/|
-              plain_line %|  ]|
+              plain_line    %|  [|
+              plain_line    %|    "Marty McFly",|
+              plain_line    %|    "Doc Brown",|
+              actual_line   %|+   "Einie",|
+              actual_line   %|+   "Lorraine McFly",|
+              expected_line %|-   "Biff Tannen",|
+              expected_line %|-   /Georg McFly/,|
+              # expected_line %|-   /Lorrain McFly/|  # TODO
+              expected_line %|-   /Lorrain McFly/,|
+              plain_line    %|  ]|
             },
           )
 
@@ -277,23 +280,23 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
             newline_before_expectation: true,
             expectation: proc {
               line do
-                plain "               Expected "
+                plain    %|               Expected |
                 # rubocop:disable Metrics/LineLength
-                beta %|[/ Brown$/, "Marty McFly", "Biff Tannen", /Georg McFly/, /Lorrain McFly/]|
+                actual   %|[/ Brown$/, "Marty McFly", "Biff Tannen", /Georg McFly/, /Lorrain McFly/]|
                 # rubocop:enable Metrics/LineLength
               end
 
               line do
-                plain "not to match array with "
-                alpha %|/ Brown$/|
-                plain ", "
-                alpha %|"Marty McFly"|
-                plain ", "
-                alpha %|"Biff Tannen"|
-                plain ", "
-                alpha %|/Georg McFly/|
-                plain " and "
-                alpha %|/Lorrain McFly/|
+                plain    %|not to match array with |
+                expected %|/ Brown$/|
+                plain    %|, |
+                expected %|"Marty McFly"|
+                plain    %|, |
+                expected %|"Biff Tannen"|
+                plain    %|, |
+                expected %|/Georg McFly/|
+                plain    %| and |
+                expected %|/Lorrain McFly/|
               end
             },
           )
@@ -314,7 +317,7 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
               a_collection_containing_exactly("zing"),
               an_object_having_attributes(baz: "qux"),
             ]
-            actual = [
+            actual   = [
               { foo: "bar" },
               double(baz: "qux"),
               { blargh: "riddle" }
@@ -331,34 +334,37 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
             snippet: %|expect(actual).to match_array(expected)|,
             expectation: proc {
               line do
-                plain "           Expected "
+                plain    %|           Expected |
                 # rubocop:disable Metrics/LineLength
-                beta %|[{ foo: "bar" }, #<Double (anonymous)>, { blargh: "riddle" }]|
+                actual   %|[{ foo: "bar" }, #<Double (anonymous) baz: "qux">, { blargh: "riddle" }]|
                 # rubocop:enable Metrics/LineLength
               end
 
               line do
-                plain "to match array with "
-                alpha %|#<a hash including (foo: "bar")>|
-                plain ", "
-                alpha %|#<a collection containing exactly ("zing")>|
-                plain " and "
-                alpha %|#<an object having attributes (baz: "qux")>|
+                plain    %|to match array with |
+                expected %|#<a hash including (foo: "bar")>|
+                plain    %|, |
+                expected %|#<a collection containing exactly ("zing")>|
+                plain    %| and |
+                expected %|#<an object having attributes (baz: "qux")>|
               end
             },
             diff: proc {
-              plain_line %|  [|
-              plain_line %|    {|
-              plain_line %|      foo: "bar"|
-              plain_line %|    },|
-              plain_line %|    #<Double (anonymous)>,|
-              plain_line %|    {|
-              plain_line %|      blargh: "riddle"|
-              plain_line %|    },|
-              alpha_line %|-   #<a collection containing exactly (|
-              alpha_line %|-     "zing"|
-              alpha_line %|-   )>|
-              plain_line %|  ]|
+              plain_line    %|  [|
+              plain_line    %|    {|
+              plain_line    %|      foo: "bar"|
+              plain_line    %|    },|
+              plain_line    %|    #<Double (anonymous) {|
+              plain_line    %|      baz: "qux"|
+              plain_line    %|    }>,|
+              actual_line   %|+   {|
+              actual_line   %|+     blargh: "riddle"|
+              actual_line   %|+   },|
+              expected_line %|-   #<a collection containing exactly (|
+              expected_line %|-     "zing"|
+              # expected_line %|-   )>|  # TODO
+              expected_line %|-   )>,|
+              plain_line    %|  ]|
             },
           )
 
@@ -375,7 +381,7 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
       as_both_colored_and_uncolored do |color_enabled|
         snippet = <<~TEST.strip
           expected = "Einie"
-          actual = ["Marty", "Jennifer", "Doc"]
+          actual   = ["Marty", "Jennifer", "Doc"]
           expect(actual).to match_array(expected)
         TEST
         program = make_plain_test_program(
@@ -388,20 +394,21 @@ RSpec.describe "Integration with RSpec's #match_array matcher", type: :integrati
           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 "."
+              plain    %|Expected |
+              actual   %|["Marty", "Jennifer", "Doc"]|
+              plain    %| to match array with |
+              expected %|"Einie"|
+              plain    %|.|
             end
           },
           diff: proc {
-            plain_line %|  [|
-            plain_line %|    "Marty",|
-            plain_line %|    "Jennifer",|
-            plain_line %|    "Doc",|
-            alpha_line %|-   "Einie"|
-            plain_line %|  ]|
+            plain_line    %|  [|
+            actual_line   %|+   "Marty",|
+            actual_line   %|+   "Jennifer",|
+            actual_line   %|+   "Doc",|
+            # expected_line %|-   "Einie"|  # TODO
+            expected_line %|-   "Einie",|
+            plain_line    %|  ]|
           },
         )