squcumber-postgres 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0038fa696e028950ec11458f8ed21529e54447eccfe61b299f0746554104877d'
-  data.tar.gz: f000dee57c42d995b90a55fc42a140421eb002222afb811cb9ab2a45bfc91cb0
+  metadata.gz: '089d8a3f411ec32c7b5915819d3da2691b91404397c2601c0468a3bebb1eb3ec'
+  data.tar.gz: 9842daf920c36ea783ba5e381993972cf71d323be275f4f47fed75729af05359
 SHA512:
-  metadata.gz: 327f4629ce093e6e96251720d00d8154ef57e39d1a6a73b53ab0fd1c3bfef6d8ac5100687c2bb47b3b27ea4441b4bd8c3c35c1154c021d3ce784a38050217790
-  data.tar.gz: b81e3a0f5cb8cc102d6d94ec4a93a44eddcb4500bef3ea4de7c2e12abf292f3b6a4153b53a17e46a9ed68305e598f8fa133271621905329e2e23622701fba7dd
+  metadata.gz: 698c9109d441bed70308522ed173a458ab78644127a56d610f1283bce68fe574a31a974873d1b303f97e01b5bc131e7d60c08b8e5be7fd6683302a5f473f66ea
+  data.tar.gz: 30cf3e31073c6fdf1fdc8d3051f19fde1c65545d75ad8b835d2535fe0332f3a2a92e59be22da5c72c1724a1e72d11ad287f7fe8986273016275139700d33de77

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')
@@ -70,6 +85,12 @@ module MatcherHelpers
         Date.today.prev_year
       when /next year/
         Date.today.next_year
+      when /\s*\d+\s+minute(s)?\s+ago\s*?/
+        number_of_minutes = value.match(/\d+/)[0].to_i
+        DateTime.now - (number_of_minutes/24.0/60.0)
+      when /\s*\d+\s+hours(s)?\s+ago\s*?/
+        number_of_hours = value.match(/\d+/)[0].to_i
+        DateTime.now - (number_of_hours/24.0)
       when /\s*\d+\s+month(s)?\s+ago\s*?/
         number_of_months = value.match(/\d+/)[0].to_i
         Date.today.prev_month(number_of_months)
@@ -79,6 +100,12 @@ module MatcherHelpers
       when /\s*\d+\s+year(s)?\s+ago\s*/
         number_of_years = value.match(/\d+/)[0].to_i
         Date.today.prev_year(number_of_years)
+      when /\s*\d+\s+minute(s)?\s+from now\s*?/
+        number_of_minutes = value.match(/\d+/)[0].to_i
+        DateTime.now + (number_of_minutes/24.0/60.0)
+      when /\s*\d+\s+hours(s)?\s+from now\s*?/
+        number_of_hours = value.match(/\d+/)[0].to_i
+        DateTime.now + (number_of_hours/24.0)
       when /\s*\d+\s+month(s)?\s+from now\s*?/
         number_of_months = value.match(/\d+/)[0].to_i
         Date.today.next_month(number_of_months)

data/spec/squcumber-postgres/mock/database_spec.rb

@@ -182,7 +182,7 @@ module Squcumber::Postgres::Mock
       end
 
       it 'asks the testing database for currently existing tables in production schemas' do
-        expect(testing_database).to have_received(:exec).with(/^\s*select\s+schemaname\s+\|\|\s+'\.'\s+\|\|\s+tablename\s+as schema\_and\_table\s+from\s+pg_tables\s+where\s+tableowner\s*=\s*'some_user'\s*;?\s*$/)
+        expect(testing_database).to have_received(:exec).with(/^\s*select\s+schemaname\s+\|\|\s+'\.'\s+\|\|\s+tablename\s+as schema\_and\_table\s+from\s+pg_tables\s+where\s+tableowner\s*=\s*'some_user'\s+and\s+schemaname\s+not\s+in\s+\('pg_catalog',\s+'information_schema'\s*\)\s*;?\s*$/)
       end
 
       it 'truncates the returned tables in the testing database' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squcumber-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Stefanie Grunwald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -159,15 +159,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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