squcumber-postgres 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0db456e704910175875824a14312d2c5668569d8
-  data.tar.gz: 9e198d71fd8649646683b2df6be14a88e139a662
+SHA256:
+  metadata.gz: 70197c6e99837cc7f6a50448932fbf35ec302afe947c4bfcd44a01e7f3932e92
+  data.tar.gz: 922ede0dc2311200bbc309d216237f9e79034642801503d837453c2c6a6ed183
 SHA512:
-  metadata.gz: 8f9db0cd15453cd1fac71a582fd821b56f1cf51fbc22d88e1446fdf1e7673383e2617a9c769e4db6f4877b092ea165fd6e46e0c2865538711dac00ed1e0f97a1
-  data.tar.gz: 4786343ae7714bfc33bc1779008a1aaacd85dd3569f5a09c9e673e076f5c96bfd532e776fed95da0c18034c90037229e864970d55e0122697eceecb5f57486ef
+  metadata.gz: 0356e70c0657e311013139b44759f6b321ec16b31c8354e763892293d86e796dabc0e6cfb5e4c2f25a379abee5fc0af0a44f1036c497cccac2747ebb28358db8
+  data.tar.gz: 5cce4bb175805a4e90e34e248279885e012f092fb74eb94aa84825b159eea95976719e6ef04383d33b29a011e8281af46d7e861d831b1351f2297fa33e547754

data/lib/squcumber-postgres/rake/task.rb

@@ -14,29 +14,42 @@ module Squcumber
             @features_dir = File.join(FileUtils.pwd, 'features')
             features = Dir.glob("#{@features_dir}/**/*.feature")
             parent_directories = features.map { |f| f.split('/')[0..-2].join('/') }.uniq
-
             features.each do |feature|
-              feature_name = feature.gsub(File.join(FileUtils.pwd, 'features/'), '').gsub('.feature', '')
+              feature_name = feature.gsub(@features_dir + '/', '').gsub('.feature', '')
               task_name = feature_name.gsub('/', ':')
               desc "Run SQL tests for feature #{feature_name}"
               task "sql:#{task_name}".to_sym, [:scenario_line_number] do |_, args|
                 cucumber_task_name = "cucumber_#{task_name}".to_sym
                 ::Cucumber::Rake::Task.new(cucumber_task_name) do |t|
                   line_number = args[:scenario_line_number].nil? ? '' : ":#{args[:scenario_line_number]}"
-                  t.cucumber_opts = "#{feature}#{line_number} --format pretty --format html --out #{feature_name.gsub('/','_')}.html --require #{File.dirname(__FILE__)}/../support --require #{File.dirname(__FILE__)}/../step_definitions"
+                  output_dir = ENV['CUSTOM_OUTPUT_DIR'] ? ENV['CUSTOM_OUTPUT_DIR'] : '/tmp'
+                  output_file = ENV['CUSTOM_OUTPUT_NAME'] ? ENV['CUSTOM_OUTPUT_NAME'] : feature_name.gsub('/', '_')
+                  output_path = output_dir + '/' + output_file
+                  output_opts = "--format html --out #{output_path}.html --format json --out #{output_path}.json"
+                  extra_config = ENV['SQUCUMBER_OPTIONS_EXTRA']
+                  t.cucumber_opts = "#{feature}#{line_number} --format pretty #{output_opts} --require #{File.dirname(__FILE__)}/../support --require #{File.dirname(__FILE__)}/../step_definitions #{ENV['CUSTOM_STEPS_DIR'] ? '--require ' + ENV['CUSTOM_STEPS_DIR'] : ''} #{extra_config}"
                 end
                 ::Rake::Task[cucumber_task_name].execute
               end
             end
 
             parent_directories.each do |feature|
-              feature_name = feature.gsub(File.join(FileUtils.pwd, 'features/'), '').gsub('.feature', '')
+              feature_name = feature.gsub(@features_dir + '/', '')
               task_name = feature_name.gsub('/', ':')
-              desc "Run SQL tests for all features in #{feature_name}"
+              if feature_name.eql?(@features_dir)
+                feature_name = 'features'
+                task_name = 'all'
+              end
+              desc "Run SQL tests for all features in /#{feature_name}"
               task "sql:#{task_name}".to_sym do
                 cucumber_task_name = "cucumber_#{task_name}".to_sym
                 ::Cucumber::Rake::Task.new(cucumber_task_name) do |t|
-                  t.cucumber_opts = "#{feature} --format pretty --format html --out #{feature_name.gsub('/','_')}.html --require #{File.dirname(__FILE__)}/../support --require #{File.dirname(__FILE__)}/../step_definitions"
+                  output_dir = ENV['CUSTOM_OUTPUT_DIR'] ? ENV['CUSTOM_OUTPUT_DIR'] : '/tmp'
+                  output_file = ENV['CUSTOM_OUTPUT_NAME'] ? ENV['CUSTOM_OUTPUT_NAME'] : feature_name.gsub('/', '_')
+                  output_path = output_dir + '/' + output_file
+                  output_opts = "--format html --out #{output_path}.html --format json --out #{output_path}.json"
+                  extra_config = ENV['SQUCUMBER_OPTIONS_EXTRA']
+                  t.cucumber_opts = "#{feature} --format pretty #{output_opts} --require #{File.dirname(__FILE__)}/../support --require #{File.dirname(__FILE__)}/../step_definitions #{ENV['CUSTOM_STEPS_DIR'] ? '--require ' + ENV['CUSTOM_STEPS_DIR'] : ''} #{extra_config}"
                 end
                 ::Rake::Task[cucumber_task_name].execute
               end

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

@@ -86,7 +86,7 @@ When(/^the given SQL files are executed$/) do
   end
 end
 
-When(/^the SQL file "?([^\s]+)"? is executed/) do |file|
+When(/^the SQL file "?([^\s"]+)"? is executed/) do |file|
   silence_streams(STDERR) do
     TESTING_DATABASE.exec_file("#{@sql_file_path}/#{file}")
   end
@@ -97,9 +97,10 @@ When(/^the resulting table "?([^\s"]*)"? is queried(?:, ordered by "?([^"]*)"?)?
   @result = TESTING_DATABASE.query("select * from #{table} #{sort_statement};").map { |e| e }
 end
 
-Then(/^the result starts with.*$/) do |data|
+Then(/^the result( with date placeholders)? starts with.*$/) do |placeholder, data|
   actual = @result[0..(data.hashes.length - 1)] || []
   expected = data.hashes || []
+  expected = convert_mock_values(expected) if placeholder
 
   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|
@@ -108,9 +109,10 @@ Then(/^the result starts with.*$/) do |data|
   end
 end
 
-Then(/^the result includes.*$/) do |data|
+Then(/^the result( with date placeholders)? includes.*$/) do |placeholder, data|
   actual = @result || []
   expected = data.hashes || []
+  expected = convert_mock_values(expected) if placeholder
 
   expected.each do |hash|
     raise("Result is not included, got:\n#{format_error(data, actual)}") unless actual.any? do |row|
@@ -121,9 +123,10 @@ Then(/^the result includes.*$/) do |data|
   end
 end
 
-Then(/^the result does not include.*$/) do |data|
+Then(/^the result( with date placeholders)? does not include.*$/) do |placeholder, data|
   actual = @result || []
   expected = data.hashes || []
+  expected = convert_mock_values(expected) if placeholder
 
   expected.each do |hash|
     raise("Result is included, got:\n#{format_error(data, actual)}") if actual.any? do |row|
@@ -134,9 +137,10 @@ Then(/^the result does not include.*$/) do |data|
   end
 end
 
-Then(/^the result exactly matches.*$/) do |data|
+Then(/^the result( with date placeholders)? exactly matches.*$/) do |placeholder, data|
   actual = @result || []
   expected = data.hashes || []
+  expected = convert_mock_values(expected) if placeholder
 
   raise("Does not match exactly, got:\n#{format_error(data, actual)}") if actual.length != expected.length
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squcumber-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - Stefanie Grunwald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -166,10 +166,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 3
-summary: Define and execute SQL integration tests for AWS postgres
+summary: Define and execute SQL integration tests for Postgres databases
 test_files:
 - spec/spec_helper.rb
 - spec/squcumber-postgres/mock/database_spec.rb