squcumber-postgres 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c7e23adc852f610e1dccd53a19444e6be0bf6707c7a4243ef475ccce0abdb6e
-  data.tar.gz: 437eac476560aa4fb9b5187a5e05c8e08c11f16954c74d0c0084808011dcd668
+  metadata.gz: a32490ebd1135e0fbd4e527a37216e807a9092f137adb94fdead577c493930f3
+  data.tar.gz: ce7dfe1d4a27fc6329a8dcdb8b866084725650acb65b0f5f3aa847cce58ba2de
 SHA512:
-  metadata.gz: 2759e739f71e4d8f51f019b4cad5bbf0933f6ef032f348494baa9fc5bcf374b7df601893ead9bfa47a7db0a7d95243399a1c013e322e030a6f5ad8f157e571d3
-  data.tar.gz: 551a53568da31c1f83e9cb91b496aea019960830a6b4151fb535d45ad13f36174ec3d8c553f7f35e6b5012dd90df3fa5a6cce6be3b81a5841e2da5b01a9c734e
+  metadata.gz: f4f385979a30214331d054dfc1b0e1cbc5a0c52b75f1991cc772949118762cbd3a85f658916fb5a1cdf3bd876eb7c41fd8f320b7dab8948907b9d4ad899dc67b
+  data.tar.gz: da362eb89ce0980d6a8beaeec97e1a46aac976543ecd67a3cba3bbeff04d7252365b304f8a3ad09e1ce7e6dd67aec21a575d471899c375f936cfdd990892e19e

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

@@ -82,13 +82,17 @@ end
 
 When(/^the given SQL files are executed$/) do
   silence_streams(STDERR) do
-    @sql_files_to_execute.each { |file| TESTING_DATABASE.exec_file(file) }
+    @sql_files_to_execute.each do |file|
+      # This overwrites the result if multiple files are executed
+      @result = TESTING_DATABASE.exec_file(file).map { |e| e }
+    end
   end
 end
 
 When(/^the SQL file "?([^\s"]+)"? is executed/) do |file|
   silence_streams(STDERR) do
-    TESTING_DATABASE.exec_file("#{@sql_file_path}/#{file}")
+    # This overwrites the result if multiple files are executed
+    @result = TESTING_DATABASE.exec_file("#{@sql_file_path}/#{file}").map { |e| e }
   end
 end
 
@@ -97,6 +101,13 @@ When(/^the resulting table "?([^\s"]*)"? is queried(?:, ordered by "?([^"]*)"?)?
   @result = TESTING_DATABASE.query("select * from #{table} #{sort_statement};").map { |e| e }
 end
 
+When(/^the result is ordered by "?([^"]+)"?/) do |sort_columns_string|
+  sort_columns = sort_columns_string.split(',').map { |sort_column| sort_column.strip }
+  @result = @result.sort_by do |row|
+    sort_columns.map { |sort_column| row[sort_column] }
+  end
+end
+
 Then(/^the result( with date placeholders)? starts with.*$/) do |placeholder, data|
   actual = @result[0..(data.hashes.length - 1)] || []
   expected = data.hashes || []

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

@@ -0,0 +1,3 @@
+require_relative 'matchers'
+
+World(MatcherHelpers)

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

@@ -34,10 +34,10 @@ module MatcherHelpers
         #    2 years ago (as year)
         #    => '2015'
         #
-        #    beginning of last month
+        #    beginning of month last month
         #    => '2017-06-01'
         #
-        #    end of last year
+        #    end of month last year
         #    => '2016-12-31'
         #
         #    today (as custom '%Y-%m')
@@ -126,7 +126,6 @@ module MatcherHelpers
 
       formatted_new_value = case format
         when nil
-          puts "NO FORMAT"
           modified_new_value.to_s
         when 'day', 'month', 'year'
           modified_new_value.send(format.to_sym)
@@ -137,13 +136,9 @@ module MatcherHelpers
           raise "Invalid date format provided: #{format}"
       end
 
-      formatted_new_value
+      formatted_new_value.to_s
     else
-      new_value
+      new_value.to_s
     end
   end
 end
-
-if defined?(World)
-  World(MatcherHelpers)
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squcumber-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Stefanie Grunwald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -142,6 +142,7 @@ files:
 - lib/squcumber-postgres/rake/task.rb
 - lib/squcumber-postgres/step_definitions/common_steps.rb
 - lib/squcumber-postgres/support/database.rb
+- lib/squcumber-postgres/support/helpers.rb
 - lib/squcumber-postgres/support/matchers.rb
 - lib/squcumber-postgres/support/output.rb
 - spec/spec_helper.rb