elasticsearch-test-runner 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a279ed35dcdcebb3992365f237f70fd6c1c9d8ee49e71d622d74a76280832203
-  data.tar.gz: 3d7e8fd20126eda08aa0e452d4dd2806a143a9fa1a227206c157e7b42090406b
+  metadata.gz: 7452d0963f9177b56e8dbfdbe0ee2d779e4e733ecff9f21be71263611b8bfe4a
+  data.tar.gz: 72100349de35737ec78f2b6617b68fb9beef9a64d3ee59b3be06bfebd30cefd2
 SHA512:
-  metadata.gz: af99ab6771f0dd2b94d600ef119c420e8a43ac06a7e06d5dc4414e31bb9ee96377689a52a98652db8069bd9a5181b892c11c973e186e868d44b020445d604175
-  data.tar.gz: dd69419f48f9f895e9d9d2646e210f0746a5696d29f4695c3066988106590fa493dd89e98e57022be38c5e110a4c12b05e62e3eb582f2b1f2907842acc8923ab
+  metadata.gz: e2709d1814074c2b29ffb9ba9066a1003ea3f074aaa13f1ceac0534c41b5b97e37e87ee42ea4525f320bf0f5e1dcafc0a55197c70afb312fad61f3c5c2d93f74
+  data.tar.gz: b2c440af0a742182c36b1c53aae1db3adc2b52ce0930ab88383c62203c9358f2589e34265bcb0180da4db4179096f0780d4775aa5ddbbb5f3f90a36fdf862631

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.9.0] - 2024-08-15
+
+- Better display of action and response when `ENV['DEBUG']` is true.
+- Checks for more error types when catching exceptions.
+- Better matching for regular expressions.
+- Refactors `set_param_variable` for better substitution.
+
+## [0.8.0] - 2024-08-14
+
+- Adds support for variable keys (`$`).
+
 ## [0.7.0] - 2024-08-08
 
 - Improves test (file) name display

data/lib/elasticsearch/tests/code_runner.rb

@@ -54,7 +54,7 @@ module Elasticsearch
           method = arrayed_method.last
         end
         @response = client.send(method.to_sym, process_params(params))
-        puts @response if ENV['DEBUG']
+        puts "Action: #{action}\nResponse: #{@response}\n\n" if ENV['DEBUG']
         @response
       rescue StandardError => e
         raise e unless expected_exception?(catchable, e)
@@ -66,7 +66,7 @@ module Elasticsearch
         case error_type
         when 'request_timeout'
           e.is_a?(Elastic::Transport::Transport::Errors::RequestTimeout)
-        when 'missing'
+        when 'missing', /resource_not_found_exception/
           e.is_a?(Elastic::Transport::Transport::Errors::NotFound)
         when 'conflict'
           e.is_a?(Elastic::Transport::Transport::Errors::Conflict)
@@ -85,6 +85,8 @@ module Elasticsearch
             e.is_a?(Elastic::Transport::Transport::Errors::BadRequest)
         when /NullPointerException/
           e.message =~ /\[400\]/
+        when /status_exception/
+          e.message =~ /\[409\]/
         else
           e.message =~ /#{error_type}/
         end
@@ -109,7 +111,9 @@ module Elasticsearch
       end
 
       def match_regexp(expected, result)
-        expected.is_a?(String) && expected.match?(/^\//) && result.match?(Regexp.new(expected.gsub('/', '')))
+        expected.is_a?(String) &&
+          expected.match?(/^\//) &&
+          result.match?(Regexp.new(expected.gsub('/', '').strip))
       end
 
       def do_length(action)
@@ -176,13 +180,11 @@ module Elasticsearch
       # Given a key coming from a test definition, search the response body for a matching value.
       #
       def search_in_response(keys)
-        if (match = /\$([a-z]+)/.match(keys))
-          return @response.send(match[1])
-        end
-
         if keys.include?('.')
           key = split_and_parse_key(keys)
           return find_value_in_document(key, @response.body)
+        elsif (match = /\$([a-z]+)/.match(keys))
+          return @response.send(match[1])
         end
 
         @response[keys]
@@ -202,7 +204,13 @@ module Elasticsearch
       end
 
       def set_param_variable(params, key, param)
-        params[key] = instance_variable_get(param.gsub('$', '@')) if param.is_a?(String) && param.include?('$')
+        return unless param.is_a?(String) && param.include?("$")
+
+        # Param can be a single '$value' string or '{ something: $value }'
+        repleacable = param.match(/(\$[0-9a-z_-]+)/)[0]
+        value = instance_variable_get(repleacable.gsub("$", "@"))
+        content = param.gsub(repleacable, value)
+        params[key] = content
       end
 
       # Given a list of keys, find the value in a recursively nested document.
@@ -217,7 +225,9 @@ module Elasticsearch
         return document[chain[0]] unless chain.size > 1
 
         # a number can be a string key in a Hash or indicate an element in a list
-        if document.is_a?(Hash)
+        if chain[0].is_a?(String) && chain[0].match?(/^\$/)
+          find_value_in_document(chain[1..], instance_variable_get("@#{chain[0].gsub('$', '')}"))
+        elsif document.is_a?(Hash)
           find_value_in_document(chain[1..], document[chain[0].to_s]) if document[chain[0].to_s]
         elsif document[chain[0]]
           find_value_in_document(chain[1..], document[chain[0]]) if document[chain[0]]

data/lib/elasticsearch/tests/version.rb

@@ -19,6 +19,6 @@
 
 module Elasticsearch
   module Tests
-    VERSION = '0.7.0'
+    VERSION = '0.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-test-runner
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Elastic Client Library Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch