super_diff 0.2.0 → 0.5.0

data/spec/integration/rails/active_record_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "Integration with Rails's ActiveRecord class", type: :integration do
+RSpec.describe "Integration with Rails's ActiveRecord class", type: :integration, active_record: true do
   context "when using 'super_diff/rspec-rails'" do
     include_context "integration with ActiveRecord"
 

data/spec/integration/rails/hash_with_indifferent_access_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "Integration with Rails's HashWithIndifferentAccess", type: :integration do
+RSpec.describe "Integration with Rails's HashWithIndifferentAccess", type: :integration, active_record: true do
   context "when using 'super_diff/rspec-rails'" do
     include_context "integration with HashWithIndifferentAccess"
 

data/spec/integration/rspec/be_predicate_matcher_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
+RSpec.describe "Integration with RSpec's #be_<predicate> matcher", type: :integration do
   # rubocop:disable Metrics/BlockLength
   ["be", "be_a", "be_an"].each do |prefix|
   # rubocop:enable Metrics/BlockLength
@@ -23,9 +23,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                     plain "Expected "
                     beta %|:foo|
                     plain " to respond to "
-                    alpha %|`strong?`|
+                    alpha %|strong?|
                     plain " or "
-                    alpha %|`strongs?`|
+                    alpha %|strongs?|
                     plain "."
                   end
                 },
@@ -42,7 +42,7 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
           it "produces the correct failure message" do
             as_both_colored_and_uncolored do |color_enabled|
               snippet = <<~TEST.strip
-                hash = { foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz" }
+                hash = { foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz", aaaaaa: "bbbbbb" }
                 expect(hash).to #{prefix}_strong
               TEST
               program = make_plain_test_program(
@@ -57,14 +57,14 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                 expectation: proc {
                   line do
                     plain "     Expected "
-                    beta %|{ foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz" }|
+                    beta %|{ foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz", aaaaaa: "bbbbbb" }|
                   end
 
                   line do
                     plain "to respond to "
-                    alpha %|`strong?`|
+                    alpha %|strong?|
                     plain " or "
-                    alpha %|`strongs?`|
+                    alpha %|strongs?|
                   end
                 },
               )
@@ -102,9 +102,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                       plain "Expected "
                       beta %|#<Foo>|
                       plain " to have a public method "
-                      alpha %|`strong?`|
+                      alpha %|strong?|
                       plain " or "
-                      alpha %|`strongs?`|
+                      alpha %|strongs?|
                       plain "."
                     end
                   },
@@ -147,9 +147,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                     line do
                       plain "to have a public method "
-                      alpha %|`strong?`|
+                      alpha %|strong?|
                       plain " or "
-                      alpha %|`strongs?`|
+                      alpha %|strongs?|
                     end
                   },
                 )
@@ -190,9 +190,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                           plain "Expected "
                           beta %|#<Foo>|
                           plain " to return a truthy result for "
-                          alpha %|`true?`|
+                          alpha %|true?|
                           plain " or "
-                          alpha %|`trues?`|
+                          alpha %|trues?|
                           plain "."
                         end
 
@@ -200,9 +200,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                         line do
                           plain "(Perhaps you want to use "
-                          blue "`be(true)`"
+                          blue "be(true)"
                           plain " or "
-                          blue "`be_truthy`"
+                          blue "be_truthy"
                           plain " instead?)"
                         end
                       },
@@ -250,18 +250,18 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                         line do
                           plain "to return a truthy result for "
-                          alpha %|`true?`|
+                          alpha %|true?|
                           plain " or "
-                          alpha %|`trues?`|
+                          alpha %|trues?|
                         end
 
                         newline
 
                         line do
                           plain "(Perhaps you want to use "
-                          blue "`be(true)`"
+                          blue "be(true)"
                           plain " or "
-                          blue "`be_truthy`"
+                          blue "be_truthy"
                           plain " instead?)"
                         end
                       },
@@ -300,9 +300,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                         plain "Expected "
                         beta %|#<X>|
                         plain " to return a truthy result for "
-                        alpha %|`false?`|
+                        alpha %|false?|
                         plain " or "
-                        alpha %|`falses?`|
+                        alpha %|falses?|
                         plain "."
                       end
                     },
@@ -341,9 +341,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                             plain "Expected "
                             beta %|#<X>|
                             plain " to return a truthy result for "
-                            alpha %|`y?`|
+                            alpha %|y?|
                             plain " or "
-                            alpha %|`ys?`|
+                            alpha %|ys?|
                             plain "."
                           end
                         },
@@ -392,9 +392,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                           line do
                             plain "to return a truthy result for "
-                            alpha %|`y?`|
+                            alpha %|y?|
                             plain " or "
-                            alpha %|`ys?`|
+                            alpha %|ys?|
                           end
                         },
                       )
@@ -432,9 +432,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
                             plain "Expected "
                             beta %|#<X>|
                             plain " to return a truthy result for "
-                            alpha %|`y?`|
+                            alpha %|y?|
                             plain " or "
-                            alpha %|`ys?`|
+                            alpha %|ys?|
                             plain "."
                           end
                         },
@@ -483,9 +483,9 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
 
                           line do
                             plain "to return a truthy result for "
-                            alpha %|`y?`|
+                            alpha %|y?|
                             plain " or "
-                            alpha %|`ys?`|
+                            alpha %|ys?|
                           end
                         },
                       )
@@ -502,40 +502,92 @@ RSpec.describe "Integration with RSpec's #be_* matcher", type: :integration do
           end
 
           context "and returns true" do
-            it "produces the correct failure message when used in the negative" do
-              as_both_colored_and_uncolored do |color_enabled|
-                snippet = <<~TEST.strip
-                  class Foo
-                    def strong?; true; end
-                  end
+            context "when the inspected version of the actual value is short" do
+              it "produces the correct failure message when used in the negative" do
+                as_both_colored_and_uncolored do |color_enabled|
+                  snippet = <<~TEST.strip
+                    class Foo
+                      def strong?; true; end
+                    end
 
-                  expect(Foo.new).not_to #{prefix}_strong
-                TEST
-                program = make_plain_test_program(
-                  snippet,
-                  color_enabled: color_enabled,
-                )
+                    expect(Foo.new).not_to #{prefix}_strong
+                  TEST
+                  program = make_plain_test_program(
+                    snippet,
+                    color_enabled: color_enabled,
+                  )
 
-                expected_output = build_expected_output(
-                  color_enabled: color_enabled,
-                  snippet: %|expect(Foo.new).not_to #{prefix}_strong|,
-                  expectation: proc {
-                    line do
-                      plain "Expected "
-                      beta %|#<Foo>|
-                      plain " not to return a truthy result for "
-                      alpha %|`strong?`|
-                      plain " or "
-                      alpha %|`strongs?`|
-                      plain "."
+                  expected_output = build_expected_output(
+                    color_enabled: color_enabled,
+                    snippet: %|expect(Foo.new).not_to #{prefix}_strong|,
+                    expectation: proc {
+                      line do
+                        plain "Expected "
+                        beta %|#<Foo>|
+                        plain " not to return a truthy result for "
+                        alpha %|strong?|
+                        plain " or "
+                        alpha %|strongs?|
+                        plain "."
+                      end
+                    },
+                  )
+
+                  expect(program).
+                    to produce_output_when_run(expected_output).
+                    in_color(color_enabled).
+                    removing_object_ids
+                end
+              end
+            end
+
+            context "when the inspected version of the actual value is long" do
+              it "produces the correct failure message when used in the negative" do
+                as_both_colored_and_uncolored do |color_enabled|
+                  snippet = <<~TEST.strip
+                    hash = {
+                      foo: "bar",
+                      baz: "qux",
+                      blargh: "foz",
+                      fizz: "buzz",
+                      aaaaaa: "bbbbbb"
+                    }
+
+                    class << hash
+                      def ys?; true; end
                     end
-                  },
-                )
 
-                expect(program).
-                  to produce_output_when_run(expected_output).
-                  in_color(color_enabled).
-                  removing_object_ids
+                    expect(hash).not_to #{prefix}_y
+                  TEST
+                  program = make_plain_test_program(
+                    snippet,
+                    color_enabled: color_enabled,
+                  )
+
+                  expected_output = build_expected_output(
+                    color_enabled: color_enabled,
+                    snippet: %|expect(hash).not_to #{prefix}_y|,
+                    newline_before_expectation: true,
+                    expectation: proc {
+                      line do
+                        plain "                         Expected "
+                        beta %|{ foo: "bar", baz: "qux", blargh: "foz", fizz: "buzz", aaaaaa: "bbbbbb" }|
+                      end
+
+                      line do
+                        plain "not to return a truthy result for "
+                        alpha %|y?|
+                        plain " or "
+                        alpha %|ys?|
+                      end
+                    },
+                  )
+
+                  expect(program).
+                    to produce_output_when_run(expected_output).
+                    in_color(color_enabled).
+                    removing_object_ids
+                end
               end
             end
           end

data/spec/integration/rspec/eq_matcher_spec.rb

@@ -142,7 +142,7 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
 
     it "produces the correct failure message when used in the negative" do
       as_both_colored_and_uncolored do |color_enabled|
-        snippet = %|expect("Jennifer").to eq("Marty")|
+        snippet = %|expect("Jennifer").not_to eq("Jennifer")|
         program = make_plain_test_program(
           snippet,
           color_enabled: color_enabled,
@@ -150,16 +150,152 @@ RSpec.describe "Integration with RSpec's #eq matcher", type: :integration do
 
         expected_output = build_expected_output(
           color_enabled: color_enabled,
-          snippet: %|expect("Jennifer").to eq("Marty")|,
+          snippet: %|expect("Jennifer").not_to eq("Jennifer")|,
           expectation: proc {
             line do
               plain "Expected "
               beta %|"Jennifer"|
+              plain " not to eq "
+              alpha %|"Jennifer"|
+              plain "."
+            end
+          },
+        )
+
+        expect(program).
+          to produce_output_when_run(expected_output).
+          in_color(color_enabled)
+      end
+    end
+  end
+
+  context "when comparing two different Time instances" do
+    it "produces the correct failure message when used in the positive" do
+      as_both_colored_and_uncolored do |color_enabled|
+        snippet = <<~RUBY
+          expected = Time.utc(2011, 12, 13, 14, 15, 16)
+          actual = Time.utc(2011, 12, 13, 14, 15, 16, 500_000)
+          expect(expected).to eq(actual)
+        RUBY
+        program = make_plain_test_program(
+          snippet,
+          color_enabled: color_enabled,
+        )
+
+        expected_output = build_expected_output(
+          color_enabled: color_enabled,
+          snippet: %|expect(expected).to eq(actual)|,
+          expectation: proc {
+            line do
+              plain "Expected "
+              beta %|2011-12-13 14:15:16.000 UTC +00:00 (Time)|
               plain " to eq "
-              alpha %|"Marty"|
+              alpha %|2011-12-13 14:15:16.500 UTC +00:00 (Time)|
               plain "."
             end
           },
+          diff: proc {
+            plain_line "  #<Time {"
+            plain_line "    year: 2011,"
+            plain_line "    month: 12,"
+            plain_line "    day: 13,"
+            plain_line "    hour: 14,"
+            plain_line "    min: 15,"
+            plain_line "    sec: 16,"
+            alpha_line "-   nsec: 500000000,"
+            beta_line  "+   nsec: 0,"
+            plain_line "    zone: \"UTC\","
+            plain_line "    gmt_offset: 0"
+            plain_line "  }>"
+          },
+        )
+
+        expect(program).
+          to produce_output_when_run(expected_output).
+          in_color(color_enabled)
+      end
+    end
+
+    it "produces the correct failure message when used in the negative" do
+      as_both_colored_and_uncolored do |color_enabled|
+        snippet = <<~RUBY
+          time = Time.utc(2011, 12, 13, 14, 15, 16)
+          expect(time).not_to eq(time)
+        RUBY
+        program = make_plain_test_program(
+          snippet,
+          color_enabled: color_enabled,
+        )
+
+        expected_output = build_expected_output(
+          color_enabled: color_enabled,
+          snippet: %|expect(time).not_to eq(time)|,
+          newline_before_expectation: true,
+          expectation: proc {
+            line do
+              plain " Expected "
+              beta %|2011-12-13 14:15:16.000 UTC +00:00 (Time)|
+            end
+
+            line do
+              plain "not to eq "
+              alpha %|2011-12-13 14:15:16.000 UTC +00:00 (Time)|
+            end
+          },
+        )
+
+        expect(program).
+          to produce_output_when_run(expected_output).
+          in_color(color_enabled)
+      end
+    end
+  end
+
+  context "when comparing two different Time and ActiveSupport::TimeWithZone instances", active_record: true do
+    it "produces the correct failure message when used in the positive" do
+      as_both_colored_and_uncolored do |color_enabled|
+        snippet = <<~RUBY
+          expected = Time.utc(2011, 12, 13, 14, 15, 16)
+          actual = Time.utc(2011, 12, 13, 15, 15, 16).in_time_zone("Europe/Stockholm")
+          expect(expected).to eq(actual)
+        RUBY
+        program = make_rspec_rails_test_program(
+          snippet,
+          color_enabled: color_enabled,
+        )
+
+        expected_output = build_expected_output(
+          color_enabled: color_enabled,
+          snippet: %|expect(expected).to eq(actual)|,
+          expectation: proc {
+            line do
+              plain "Expected "
+              beta %|2011-12-13 14:15:16.000 UTC +00:00 (Time)|
+            end
+
+            line do
+              plain "   to eq "
+              alpha %|2011-12-13 16:15:16.000 CET +01:00 (ActiveSupport::TimeWithZone)|
+            end
+          },
+          diff: proc {
+            plain_line "  #<ActiveSupport::TimeWithZone {"
+            plain_line "    year: 2011,"
+            plain_line "    month: 12,"
+            plain_line "    day: 13,"
+            alpha_line "-   hour: 16,"
+            beta_line  "+   hour: 14,"
+            plain_line "    min: 15,"
+            plain_line "    sec: 16,"
+            plain_line "    nsec: 0,"
+            alpha_line "-   zone: \"CET\","
+            beta_line  "+   zone: \"UTC\","
+            alpha_line "-   gmt_offset: 3600,"
+            beta_line  "+   gmt_offset: 0,"
+            alpha_line "-   utc: 2011-12-13 15:15:16.000 UTC +00:00 (Time)"
+            beta_line  "+   utc: 2011-12-13 14:15:16.000 UTC +00:00 (Time)"
+            plain_line "  }>"
+          },
         )
 
         expect(program).