simple_approvals-rspec 1.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c20a53cf7f893c8d8f0f9a58e2a64e6a5a682bb
-  data.tar.gz: 0ed1fd3bb0196f4eda2706f46bcb15872b1c0e33
+SHA256:
+  metadata.gz: f71df43a87b07fe15b71e6cc0c24c3482c2aff226ff36714be8a988d919edfd2
+  data.tar.gz: 3cfe824a91b39e426f1e101616a558c787f4104e24e8117b1707112e5f1a923c
 SHA512:
-  metadata.gz: dd650c025baabbf738ba6387850104387666db9488d8e0a57c784daebfcd1436a9e50647698cbacf4498bfa9d346e8e78dd9584d50344c7e4e28d39dfc26d007
-  data.tar.gz: 49c001062ba5562c699b57e021b25516166b25004b2a09c7752568df45421880bbb5f019d8b7dd6bc5d324fa4d4258d227a224e3630161b48b9a63140e03d66c
+  metadata.gz: 25605c30b71b93bab1ededdc8ade9f8fbfefaa64c513eee4d0972792687fb399fe68cbb3287f76602bbe6b8146ac84af08be0fc11f2cd02828d87ac18a069359
+  data.tar.gz: 817c7d0811dfeea3e111ed9d99dd45149bb41ba72305666dff71c26d05d31c3f0a7e52f8d3eaa5cede99154b670b470ea44d12670bc36daca903e1678b24689d

data/lib/simple_approvals/rspec/approvals.rb

@@ -5,33 +5,33 @@ class Approvals
       scrubbed_content = apply_optional_scrubber(rendered_content, options)
       pre_approve_if_asked(approved_path, scrubbed_content, options)
 
-      expected_content = load_expected_content(approved_path, **options)
+      expected_content = load_expected_content(approved_path, options)
       received_path = received_path_for approved_path
 
       if scrubbed_content.strip.empty?
-        raise_verify_error_with_diff(approved_path, received_path, scrubbed_content, **options) unless options[:allow_empty]
+        raise_verify_error_with_diff(approved_path, received_path, scrubbed_content, options) unless options[:allow_empty]
       elsif scrubbed_content.strip == expected_content.strip
-        handle_match(received_path, scrubbed_content, **options)
+        handle_match(received_path, scrubbed_content, options)
       else
-        raise_verify_error_with_diff(approved_path, received_path, scrubbed_content, **options)
+        raise_verify_error_with_diff(approved_path, received_path, scrubbed_content, options)
       end
     end
 
     private
 
-    def apply_optional_scrubber(content, **options)
-      if options.key?(:scrubber) && options[:scrubber]
+    def apply_optional_scrubber(content, options)
+      if options.has_key?(:scrubber) && options[:scrubber]
         options[:scrubber].call(content)
       else
         content
       end
     end
 
-    def pre_approve_if_asked(approved_path, scrubbed_content, **options)
+    def pre_approve_if_asked(approved_path, scrubbed_content, options)
       File.write(approved_path, scrubbed_content) if options[:approve_all] || options[:accept_all] || ENV['APPROVE_ALL']
     end
 
-    def handle_match(received_path, received_content, **options)
+    def handle_match(received_path, received_content, options)
       if options[:keep_received_file] == true
         File.write(received_path, received_content)
       elsif File.file?(received_path)
@@ -43,7 +43,7 @@ class Approvals
       "#{approved_path}.received"
     end
 
-    def load_expected_content(approved_path, **options)
+    def load_expected_content(approved_path, options)
       if File.file? approved_path
         File.read(approved_path)
       else
@@ -52,7 +52,7 @@ class Approvals
       end
     end
 
-    def raise_verify_error_with_diff(approved_path, received_path, received_content, **options)
+    def raise_verify_error_with_diff(approved_path, received_path, received_content, options)
       File.write(received_path, received_content)
 
       # and generate a diff for the console
@@ -61,8 +61,18 @@ class Approvals
       message << %(- writing received content to: "#{received_path}")
       message << "\n"
 
-      expected_content = load_expected_content(approved_path)
-      ::RSpec::Expectations.fail_with message, expected_content, received_content
+      expected_content = load_expected_content(approved_path, options)
+
+      if !expected_content.include?("\n") || !received_content.include?("\n")
+        # work around a bug in rspec-support 3.12.0's differ
+        # where it shows nothing when both strings are single line
+        # https://github.com/rspec/rspec-support/blob/v3.12.0/lib/rspec/support/differ.rb#L16-L18
+        message << "expected: #{expected_content.inspect}\n"
+        message << "received: #{received_content.inspect}\n"
+        ::RSpec::Expectations.fail_with message
+      else
+        ::RSpec::Expectations.fail_with message, expected_content, received_content
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_approvals-rspec
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - David Alpert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,24 +122,23 @@ files:
 homepage: https://github.com/davidalpert/simple_approvals-rspec/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []