From 2dec63d77a0b518ac611f8c182794aa509787aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miros=C5=82aw=20Prag=C5=82owski?= Date: Wed, 8 Jul 2020 12:33:22 +0200 Subject: [PATCH] Fix formatting in rspec matcher's tests The latest changes in diff-lcs gem (updated to 1.4.4) have lead to fails in our tests due to wrong formatted output. The change has been introduced here: https://github.com/halostatue/diff-lcs/issues/65 --- .../spec/rails_event_store/rspec/be_event_spec.rb | 12 ++++++------ .../rails_event_store/rspec/have_applied_spec.rb | 4 ++-- .../rails_event_store/rspec/have_published_spec.rb | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rails_event_store-rspec/spec/rails_event_store/rspec/be_event_spec.rb b/rails_event_store-rspec/spec/rails_event_store/rspec/be_event_spec.rb index 30f17a8116..747cdc70a2 100644 --- a/rails_event_store-rspec/spec/rails_event_store/rspec/be_event_spec.rb +++ b/rails_event_store-rspec/spec/rails_event_store/rspec/be_event_spec.rb @@ -76,7 +76,7 @@ def formatter got: FooEvent with data: {} Data diff: -@@ -1,2 +1,2 @@ +@@ -1 +1 @@ -{:foo=>"bar"} +{} }) @@ -106,7 +106,7 @@ def formatter got: FooEvent with metadata: {} Metadata diff: -@@ -1,2 +1,2 @@ +@@ -1 +1 @@ -{:foo=>"bar"} +{} }) @@ -120,12 +120,12 @@ def formatter got: FooEvent with metadata: {} data: {} Metadata diff: -@@ -1,2 +1,2 @@ +@@ -1 +1 @@ -{:bar=>"baz"} +{} Data diff: -@@ -1,2 +1,2 @@ +@@ -1 +1 @@ -{:foo=>"bar"} +{} }) @@ -139,12 +139,12 @@ def formatter got: FooEvent with metadata: {:baz=>"foo"} data: {:bar=>"baz"} Metadata diff: -@@ -1,2 +1,2 @@ +@@ -1 +1 @@ -{:bar=>"baz"} +{:baz=>"foo"} Data diff: -@@ -1,2 +1,2 @@ +@@ -1 +1 @@ -{:foo=>"bar"} +{:bar=>"baz"} }) diff --git a/rails_event_store-rspec/spec/rails_event_store/rspec/have_applied_spec.rb b/rails_event_store-rspec/spec/rails_event_store/rspec/have_applied_spec.rb index e39f8c83a4..ca4737313c 100644 --- a/rails_event_store-rspec/spec/rails_event_store/rspec/have_applied_spec.rb +++ b/rails_event_store-rspec/spec/rails_event_store/rspec/have_applied_spec.rb @@ -159,7 +159,7 @@ def phraser expect(matcher_.failure_message.to_s).to match(<<~EOS) expected [#{expected.inspect}] to be applied, diff: - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -[#{actual.inspect}] +[#{expected.inspect}] EOS @@ -174,7 +174,7 @@ def phraser expect(matcher_.failure_message_when_negated.to_s).to eq(<<~EOS) expected [#{expected.inspect}] not to be applied, diff: - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -[#{actual.inspect}] +[#{expected.inspect}] EOS diff --git a/rails_event_store-rspec/spec/rails_event_store/rspec/have_published_spec.rb b/rails_event_store-rspec/spec/rails_event_store/rspec/have_published_spec.rb index e3582f0c7d..dc409dd08d 100644 --- a/rails_event_store-rspec/spec/rails_event_store/rspec/have_published_spec.rb +++ b/rails_event_store-rspec/spec/rails_event_store/rspec/have_published_spec.rb @@ -223,7 +223,7 @@ def phraser expect(matcher_.failure_message.to_s).to eq(<<~EOS) expected [#{expected.inspect}] to be published, diff: - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -[#{actual.inspect}] +[#{expected.inspect}] EOS @@ -236,7 +236,7 @@ def phraser expect(matcher_.failure_message_when_negated.to_s).to eq(<<~EOS) expected [#{expected.inspect}] not to be published, diff: - @@ -1,2 +1,2 @@ + @@ -1 +1 @@ -[#{actual.inspect}] +[#{expected.inspect}] EOS