squcumber-postgres 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '089d8a3f411ec32c7b5915819d3da2691b91404397c2601c0468a3bebb1eb3ec'
-  data.tar.gz: 9842daf920c36ea783ba5e381993972cf71d323be275f4f47fed75729af05359
+  metadata.gz: 23fde2ac6689e3e38cb90410131d9f214c7541d341875886e664e0e136e6dbc6
+  data.tar.gz: 021bcd824e130d9e0b6042e12b40d182610235242c784de12bcd9d9b2e841ea8
 SHA512:
-  metadata.gz: 698c9109d441bed70308522ed173a458ab78644127a56d610f1283bce68fe574a31a974873d1b303f97e01b5bc131e7d60c08b8e5be7fd6683302a5f473f66ea
-  data.tar.gz: 30cf3e31073c6fdf1fdc8d3051f19fde1c65545d75ad8b835d2535fe0332f3a2a92e59be22da5c72c1724a1e72d11ad287f7fe8986273016275139700d33de77
+  metadata.gz: 9320112c56ba18a66c9ca765c03255f5f4a59056f9b7125476ba2d3200062dc8b6f4966f344c757bf76fc00a8b9dfc9786f7afc220cd69376bb5004ac64d1347
+  data.tar.gz: f57cf9ff57f707e8a92f81189bf20f1da470f67cae228f44ccf0466bdf907a6a9ea4d729cb9a809b02a543495ca24609588b5db7411416c32f3ddd17c3e1d88a

data/lib/squcumber-postgres/step_definitions/common_steps.rb

@@ -58,6 +58,10 @@ Given(/^the following defaults for "?([^\s"]+)"? \(if not stated otherwise\):$/)
   @defaults[table] = data.hashes[0]
 end
 
+Given(/^"([^\s"]+)" as null value$/) do |null_placeholder|
+  @null ||= null_placeholder
+end
+
 Given(/a clean environment/) do
   silence_streams(STDERR) do
     TESTING_DATABASE.truncate_all_tables()
@@ -74,6 +78,7 @@ Given(/^the existing table "?([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)"?( with date place
   end
 
   mock_data = convert_mock_values(mock_data) if placeholder
+  mock_data = convert_null_values(mock_data, @null) if @null
 
   TESTING_DATABASE.mock(
     Hash["#{schema}.#{table}", mock_data]
@@ -112,12 +117,13 @@ Then(/^the result( with date placeholders)? starts with.*$/) do |placeholder, da
   actual = @result[0..(data.hashes.length - 1)] || []
   expected = data.hashes || []
   expected = convert_mock_values(expected) if placeholder
+  expected = convert_null_values(expected, @null) if @null
 
   sanity_check_result(actual, expected)
 
   expected.each_with_index do |hash, i|
     raise("Does not start with expected result, got:\n#{format_error(data, actual)}") unless actual[i].all? do |key, value|
-      values_match(value, hash[key]) # actual,expected
+      values_match(value, hash[key], null=@null) # actual,expected
     end
   end
 end
@@ -126,13 +132,14 @@ Then(/^the result( with date placeholders)? includes.*$/) do |placeholder, data|
   actual = @result || []
   expected = data.hashes || []
   expected = convert_mock_values(expected) if placeholder
+  expected = convert_null_values(expected, @null) if @null
 
   sanity_check_result(actual, expected)
 
   expected.each do |hash|
     raise("Result is not included, got:\n#{format_error(data, actual)}") unless actual.any? do |row|
       row.all? do |key, value|
-        values_match(value, hash[key]) # actual, expected
+        values_match(value, hash[key], null=@null) # actual, expected
       end
     end
   end
@@ -142,13 +149,14 @@ Then(/^the result( with date placeholders)? does not include.*$/) do |placeholde
   actual = @result || []
   expected = data.hashes || []
   expected = convert_mock_values(expected) if placeholder
+  expected = convert_null_values(expected, @null) if @null
 
   sanity_check_result(actual, expected)
 
   expected.each do |hash|
     raise("Result is included, got:\n#{format_error(data, actual)}") if actual.any? do |row|
       row.all? do |key, value|
-        values_match(value, hash[key]) # actual,expected
+        values_match(value, hash[key], null=@null) # actual,expected
       end
     end
   end
@@ -158,6 +166,7 @@ Then(/^the result( with date placeholders)? exactly matches.*$/) do |placeholder
   actual = @result || []
   expected = data.hashes || []
   expected = convert_mock_values(expected) if placeholder
+  expected = convert_null_values(expected, @null) if @null
 
   sanity_check_result(actual, expected)
 
@@ -165,13 +174,13 @@ Then(/^the result( with date placeholders)? exactly matches.*$/) do |placeholder
 
   actual.each_with_index do |row, i|
     raise("Does not match exactly, got:\n#{format_error(data, actual)}") unless (expected[i] || {}).all? do |key, value|
-      values_match(row[key], value) # actual,expected
+      values_match(row[key], value, null=@null) # actual,expected
     end
   end
 
   expected.each_with_index do |hash, i|
     raise("Does not match exactly, got:\n#{format_error(data, actual)}") unless (actual[i] || {}).all? do |key, value|
-      values_match(value, hash[key]) # actual,expected
+      values_match(value, hash[key], null=@null) # actual,expected
     end
   end
 end

data/lib/squcumber-postgres/support/matchers.rb

@@ -10,7 +10,7 @@ module MatcherHelpers
     end
   end
 
-  def values_match(actual, expected)
+  def values_match(actual, expected, null=nil)
     if expected.eql?('today')
       actual.match(/#{Regexp.quote(Date.today.to_s)}/)
     elsif expected.eql?('yesterday')
@@ -21,6 +21,8 @@ module MatcherHelpers
       actual.match(/^#{Regexp.quote(Date.today.to_s)} \d{2}:\d{2}:\d{2}$/)
     elsif expected.eql?('sometime yesterday')
       actual.match(/^#{Regexp.quote((Date.today - 1).to_s)} \d{2}:\d{2}:\d{2}$/)
+    elsif !null.nil? and !expected.nil? and expected.eql?(null)
+      actual.nil?
     elsif expected.eql?('any_string')
       true if actual.is_a?(String) or actual.nil?
     elsif expected.eql?('false') or expected.eql?('true')
@@ -33,6 +35,24 @@ module MatcherHelpers
     end
   end
 
+  def convert_null_values(mock_data, null)
+    mock_data.map do |entry|
+      entry.each do |key, value|
+        entry[key] = convert_null_value(value, null)
+      end
+    end
+  end
+
+  def convert_null_value(value, null)
+    if null.nil?
+      value
+    elsif value.eql?(null)
+      nil
+    else
+      value
+    end
+  end
+
   def convert_mock_values(mock_data)
     mock_data.map do |entry|
       entry.each do |key, value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squcumber-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Stefanie Grunwald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -131,7 +131,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: 
-email: steffi@physics.org
+email: hi@moer.tel
 executables: []
 extensions: []
 extra_rdoc_files: []