elasticsearch-test-runner 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee56a5237bb5f84f1736eadf3d0bc16368cccd7889bbaf2a5a9f39f4c252e821
-  data.tar.gz: 102d52581d5663b0848d3b2a794b12c20bc11f195a79f2cb8ac57c94e1b818c5
+  metadata.gz: d09d996ce00f24cbdd34e54d447eff53c19a0a023fa55a61043a5215626e21a8
+  data.tar.gz: 77fc59d5846f32c165dcb3ac72bf475c0e572a12f03e7aab80a85030b6e6d7c0
 SHA512:
-  metadata.gz: c0bdd05bd218933af4dc65c51917829bc68f07e312c959fbce1b0efbf6446444af48fd1ae72620a98cd9ce8836a5454807a988f007de0ccd7201a13f3868de9e
-  data.tar.gz: 1cfb660fe7e81c143e42e6aaf886b4f2b3d5f33dbee48a78234f27518725bfacf52af1ca5a27d6f65521de9a8139e18fbe6926c6fdc93c13fb54eaebd182009a
+  metadata.gz: 69587a3c06c098c03c74e2b26f114228012ee97d73267a5623e44e0d689e776d0c9dc85a1cc503a0ac397c68d9939c338bd6a88bcaf0ffacf2cbf77a31d0cc17
+  data.tar.gz: 4b4e6315e953fbc534b8fdbc06db5462e7656cee80c1f5edfbd21cbede0956513e2f7d45faff87c77b5cf61a34526d89d9a9b907d4887ff8e9d4cbf4258b6b1b

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.8.0] - 2024-08-14
+
+- Adds support for variable keys (`$`).
+
+## [0.7.0] - 2024-08-08
+
+- Improves test (file) name display
+- Updates QUIET environment variable check
+
 ## [0.6.0] - 2024-08-07
 
 - Adds `header` support, headers can be specified for an action.

data/lib/elasticsearch/tests/code_runner.rb

@@ -176,13 +176,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]
@@ -217,7 +215,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/printer.rb

@@ -28,15 +28,15 @@ module Elasticsearch
                    else
                      @response.status
                    end
-        if ENV['QUIET']
+        if ENV['QUIET'] == 'true'
           print '🟢 '
         else
-          puts "🟢 #{@file} #{@title} passed. Response: #{response}"
+          puts "🟢 #{@short_name} #{@title} passed. Response: #{response}"
         end
       end
 
       def print_failure(action, response)
-        puts "🔴 #{@file} #{@title} failed"
+        puts "🔴 #{@short_name} #{@title} failed"
         puts "Expected result: #{action}" # TODO: Show match/length differently
         if defined?(ElasticsearchServerless) &&
            response.is_a?(ElasticsearchServerless::API::Response) ||
@@ -46,7 +46,7 @@ module Elasticsearch
         else
           pp response
         end
-        raise Elasticsearch::Tests::ActionError.new(response.body, @file, action)
+        raise Elasticsearch::Tests::ActionError.new(response.body, @short_name, action)
       end
 
       def print_match_failure(action)
@@ -54,7 +54,7 @@ module Elasticsearch
         value = action['match'].values.first
 
         message = <<~MSG
-          🔴 #{@file} #{@title} failed
+          🔴 #{@short_name} #{@title} failed
           Expected: { #{keys}: #{value} }
           Actual  : { #{keys}: #{search_in_response(action['match'].keys.first)} }
           Response: #{@response}
@@ -63,7 +63,7 @@ module Elasticsearch
       end
 
       def print_error(error)
-        puts "❌ ERROR: #{@file} #{@title} failed\n"
+        puts "❌ ERROR: #{@short_name} #{@title} failed\n"
         logger.error error.display
         backtrace = error.backtrace.join("\n")
         logger.error "#{backtrace}\n"

data/lib/elasticsearch/tests/test.rb

@@ -33,7 +33,9 @@ module Elasticsearch
         @teardown = extract_teardown!(yaml)
         @title = yaml.first.keys.first
         @actions = yaml.first[@title]
-        @file = test_filename(file)
+        @file = file
+        name = file.split('/')
+        @short_name = "#{name[-2]}/#{name[-1]}"
         @client = client
       end
 
@@ -93,11 +95,6 @@ module Elasticsearch
         @actions.select { |a| a.keys.first == 'do' }.count
       end
 
-      def test_filename(file)
-        name = file.split('/')
-        "#{name[-2]}/#{name[-1]}"
-      end
-
       def extract_setup!(yaml)
         yaml.map.with_index do |a, i|
           yaml.delete_at(i) if a.keys.first == 'setup'

data/lib/elasticsearch/tests/test_runner.rb

@@ -53,8 +53,9 @@ module Elasticsearch
         @tests_count = 0
         @errors = []
 
-        @test_files.map do |test_file|
-          build_and_run_tests(test_file)
+        @test_files.map do |test_path|
+          test_file = test_filename(test_path)
+          build_and_run_tests(test_path)
         rescue Psych::SyntaxError => e
           @errors << { error: e, file: test_file }
           @logger.warn("YAML error in #{test_file}")
@@ -70,19 +71,24 @@ module Elasticsearch
         end
       end
 
-      def build_and_run_tests(test_file)
-        yaml = YAML.load_stream(File.read(test_file))
+      def build_and_run_tests(test_path)
+        yaml = YAML.load_stream(File.read(test_path))
         requires = extract_requires!(yaml).compact.first['requires']
         return unless (requires['serverless'] == true && @serverless) ||
                       (requires['stack'] == true && !@serverless)
 
-        test = Elasticsearch::Tests::Test.new(yaml, test_file, @client)
+        test = Elasticsearch::Tests::Test.new(yaml, test_path, @client)
         test.execute
         @tests_count += test.count
       rescue StandardError => e
         raise e
       end
 
+      def test_filename(file)
+        name = file.split('/')
+        "#{name[-2]}/#{name[-1]}"
+      end
+
       def select_test_files(test_files)
         tests_path = if test_files.empty?
                        "#{@path}/**/*.yml"

data/lib/elasticsearch/tests/version.rb

@@ -19,6 +19,6 @@
 
 module Elasticsearch
   module Tests
-    VERSION = '0.6.0'
+    VERSION = '0.8.0'
   end
 end

metadata

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