squcumber-postgres 0.0.9 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40f6d596b4561fa3380966897373a4f390a3bd9fe953e425ed6f8f3756e93089
-  data.tar.gz: 28b6cec09df0c495c8d8d72c10aabcd0ccf21a4422e0288fcd51b895a697071e
+  metadata.gz: 3e828300f0cb8a7c23134fb497f7c8db77b964fd1b1ecbd624133e1f43f6e9c8
+  data.tar.gz: 13a4b5d872b18ef71e6437cc4f73aa588054c720d36ef086822e74d6c605bde2
 SHA512:
-  metadata.gz: 273bf470cb12b1cc0cb67a7904fd81f5a02b027b0f7e5154fe3254336f309ad406fd49a54b76710932fb4736608441e7fcdb7c031b97ff9d80aca9adf3202f66
-  data.tar.gz: bc353761f60bfed9965b7380a3347c32cbd19d99c0082ba97061852f6aab3217ec4e8436a470f016d0b32436787dcd435020d303746e83370b882f9995e1b500
+  metadata.gz: 44cb35f73d0a380e2d8ceed798c25a2f4f80b07051ff3c485cf5618df67f817d3433c037a76f3a6265362fa86db8cbf7628ee0c2e71ff8338c9657883dc37a93
+  data.tar.gz: 87eb56e555d10ee0bd0924ea51985775583160764b025f7c8f2ba20a602724e39b06dc043bbb6274247be6f03f16ab778b038e859b8b8563027528529685accd

data/lib/squcumber-postgres/mock/database.rb

@@ -36,7 +36,7 @@ module Squcumber
 
         def truncate_all_tables
           @testing_database
-            .exec("select schemaname || '.' || tablename as schema_and_table from pg_tables where tableowner = '#{ENV['DB_USER']}'")
+            .exec("select schemaname || '.' || tablename as schema_and_table from pg_tables where tableowner = '#{ENV['DB_USER']}' and schemaname not in ('pg_catalog', 'information_schema')")
             .map { |row| row['schema_and_table'] }
             .each { |schema_and_table| exec("truncate table #{schema_and_table}") }
         end

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

@@ -113,6 +113,8 @@ Then(/^the result( with date placeholders)? starts with.*$/) do |placeholder, da
   expected = data.hashes || []
   expected = convert_mock_values(expected) if placeholder
 
+  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
@@ -125,10 +127,12 @@ Then(/^the result( with date placeholders)? includes.*$/) do |placeholder, data|
   expected = data.hashes || []
   expected = convert_mock_values(expected) if placeholder
 
+  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]) # actual, expected
       end
     end
   end
@@ -139,6 +143,8 @@ Then(/^the result( with date placeholders)? does not include.*$/) do |placeholde
   expected = data.hashes || []
   expected = convert_mock_values(expected) if placeholder
 
+  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|
@@ -153,6 +159,8 @@ Then(/^the result( with date placeholders)? exactly matches.*$/) do |placeholder
   expected = data.hashes || []
   expected = convert_mock_values(expected) if placeholder
 
+  sanity_check_result(actual, expected)
+
   raise("Does not match exactly, got:\n#{format_error(data, actual)}") if actual.length != expected.length
 
   actual.each_with_index do |row, i|

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

@@ -1,4 +1,15 @@
 module MatcherHelpers
+  def sanity_check_result(actual, expected)
+    raise("The returned result is empty") if actual.empty?
+    raise("No data provided for comparison") if expected.empty?
+
+    expected[0].keys.each do |expected_key|
+      unless actual[0].keys.include?(expected_key)
+        raise("Column name '#{expected_key}' does not exist in result.\nAvailable column names are #{actual[0].keys.join(', ')}")
+      end
+    end
+  end
+
   def values_match(actual, expected)
     if expected.eql?('today')
       actual.match(/#{Regexp.quote(Date.today.to_s)}/)
@@ -6,6 +17,10 @@ module MatcherHelpers
       actual.match(/#{Regexp.quote((Date.today - 1).to_s)}/)
     elsif expected.eql?('any_date')
       actual.match(/^\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2}$/)
+    elsif expected.eql?('sometime today')
+      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 expected.eql?('any_string')
       true if actual.is_a?(String) or actual.nil?
     elsif expected.eql?('false') or expected.eql?('true')
@@ -18,8 +33,6 @@ module MatcherHelpers
     end
   end
 
-  def timetravel(date, i, method); i > 0 ? timetravel(date.send(method.to_sym), i - 1, method) : date; end
-
   def convert_mock_values(mock_data)
     mock_data.map do |entry|
       entry.each do |key, value|
@@ -61,35 +74,35 @@ module MatcherHelpers
       when /today/
         Date.today
       when /yesterday/
-        timetravel(Date.today, 1, :prev_day)
+        Date.today.prev_day
       when /tomorrow/
-        timetravel(Date.today, 1, :next_day)
+        Date.today.next_day
       when /last month/
-        timetravel(Date.today, 1, :prev_month)
+        Date.today.prev_month
       when /next month/
-        timetravel(Date.today, 1, :next_month)
+        Date.today.next_month
       when /last year/
-        timetravel(Date.today, 1, :prev_year)
+        Date.today.prev_year
       when /next year/
-        timetravel(Date.today, 1, :next_year)
+        Date.today.next_year
       when /\s*\d+\s+month(s)?\s+ago\s*?/
         number_of_months = value.match(/\d+/)[0].to_i
-        timetravel(Date.today, number_of_months, :prev_month)
+        Date.today.prev_month(number_of_months)
       when /\s*\d+\s+day(s)?\s+ago\s*/
         number_of_days = value.match(/\d+/)[0].to_i
-        timetravel(Date.today, number_of_days, :prev_day)
+        Date.today.prev_day(number_of_days)
       when /\s*\d+\s+year(s)?\s+ago\s*/
         number_of_years = value.match(/\d+/)[0].to_i
-        timetravel(Date.today, number_of_years, :prev_year)
+        Date.today.prev_year(number_of_years)
       when /\s*\d+\s+month(s)?\s+from now\s*?/
         number_of_months = value.match(/\d+/)[0].to_i
-        timetravel(Date.today, number_of_months, :next_month)
+        Date.today.next_month(number_of_months)
       when /\s*\d+\s+day(s)?\s+from now\s*/
         number_of_days = value.match(/\d+/)[0].to_i
-        timetravel(Date.today, number_of_days, :next_day)
+        Date.today.next_day(number_of_days)
       when /\s*\d+\s+year(s)?\s+from now\s*/
         number_of_years = value.match(/\d+/)[0].to_i
-        timetravel(Date.today, number_of_years, :next_year)
+        Date.today.next_year(number_of_years)
       else
         placeholder
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squcumber-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.13
 platform: ruby
 authors:
 - Stefanie Grunwald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -166,8 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 3
 summary: Define and execute SQL integration tests for Postgres databases