ruby-jmeter 3.1.02 → 3.1.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccdd46b52ad5147253b948f1fb4f11b9deebf5bf
-  data.tar.gz: d814597c2b3d417a5ecd3bf6e1eea24ff1448ba1
+  metadata.gz: ac92173462bb45a1badf8df5e06ffbd781af3789
+  data.tar.gz: c6cd65d134f965eba9dd19e20acdb0b18f2fc91a
 SHA512:
-  metadata.gz: a82bd04e23b29833f626620241289951c9ec5d20d826a9010c4f2d5799d5ba0182ce508b7aa34ad28b20793124a9bd1d906c8b83cdd9bbc0d54454deec493824
-  data.tar.gz: 69ae16e1b7bee35fa8a863eff07b9231e566cf051fce2caa539f46d3658617108556fdb962034a5b015ed98ff59fc1d7319e43589f5c4d6a8f7d18c73d93ee65
+  metadata.gz: 327f5e97cc508febe7144dd723743ae5cfb5241629ca37004421b840b9b92a7f8b4ad946c1d6a5f38722b3ac23a04458bf1f52db746981228ed3299286fdd859
+  data.tar.gz: 0018846bf58fc186e0cb873b91912168c44e22525b23fe6448a37caf144df3b1a59d4530e2df8411125fd16ef96678b5f121ad624c9718d2f3c3abc599d5ca78

data/lib/ruby-jmeter/dsl/http_request_defaults.rb

@@ -19,6 +19,8 @@ module RubyJmeter
   </elementProp>
   <stringProp name="HTTPSampler.domain"/>
   <stringProp name="HTTPSampler.port"/>
+  <stringProp name="HTTPSampler.proxyHost"/>
+  <stringProp name="HTTPSampler.proxyPort"/>
   <stringProp name="HTTPSampler.connect_timeout"/>
   <stringProp name="HTTPSampler.response_timeout"/>
   <stringProp name="HTTPSampler.protocol"/>
@@ -28,6 +30,7 @@ module RubyJmeter
   <boolProp name="HTTPSampler.image_parser">true</boolProp>
   <boolProp name="HTTPSampler.concurrentDwn">true</boolProp>
   <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+  <stringProp name="HTTPSampler.embedded_url_re"/>
 </ConfigTestElement>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/xpath_assertion.rb

@@ -20,6 +20,7 @@ module RubyJmeter
   <boolProp name="XPath.whitespace">false</boolProp>
   <boolProp name="XPath.tolerant">false</boolProp>
   <boolProp name="XPath.namespace">false</boolProp>
+  <stringProp name="Assertion.scope">all</stringProp>
 </XPathAssertion>)
       EOS
       update params

data/lib/ruby-jmeter/dsl/xpath_extractor.rb

@@ -20,6 +20,7 @@ module RubyJmeter
   <boolProp name="XPathExtractor.validate">false</boolProp>
   <boolProp name="XPathExtractor.tolerant">false</boolProp>
   <boolProp name="XPathExtractor.namespace">false</boolProp>
+  <stringProp name="Sample.scope">all</stringProp>
 </XPathExtractor>)
       EOS
       update params

data/lib/ruby-jmeter/extend/config_elements/http_cache_manager.rb

@@ -2,6 +2,7 @@ module RubyJmeter
   class ExtendedDSL < DSL
     def http_cache_manager(params = {}, &block)
       params[:clearEachIteration] = true if params.keys.include? :clear_each_iteration
+      params[:useExpires] = true if params.keys.include? :use_expires
 
       super
     end

data/lib/ruby-jmeter/idl.xml

@@ -82,6 +82,8 @@
         </elementProp>
         <stringProp name="HTTPSampler.domain"></stringProp>
         <stringProp name="HTTPSampler.port"></stringProp>
+        <stringProp name="HTTPSampler.proxyHost"></stringProp>
+        <stringProp name="HTTPSampler.proxyPort"></stringProp>
         <stringProp name="HTTPSampler.connect_timeout"></stringProp>
         <stringProp name="HTTPSampler.response_timeout"></stringProp>
         <stringProp name="HTTPSampler.protocol"></stringProp>
@@ -91,6 +93,7 @@
         <boolProp name="HTTPSampler.image_parser">true</boolProp>
         <boolProp name="HTTPSampler.concurrentDwn">true</boolProp>
         <stringProp name="HTTPSampler.concurrentPool">4</stringProp>
+        <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
       </ConfigTestElement>
       <hashTree/>
       <JavaConfig guiclass="JavaConfigGui" testclass="JavaConfig" testname="Java Request Defaults" enabled="true">
@@ -885,6 +888,7 @@
           <boolProp name="XPathExtractor.validate">false</boolProp>
           <boolProp name="XPathExtractor.tolerant">false</boolProp>
           <boolProp name="XPathExtractor.namespace">false</boolProp>
+          <stringProp name="Sample.scope">all</stringProp>
         </XPathExtractor>
         <hashTree/>
         <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
@@ -969,6 +973,7 @@
           <boolProp name="XPath.whitespace">false</boolProp>
           <boolProp name="XPath.tolerant">false</boolProp>
           <boolProp name="XPath.namespace">false</boolProp>
+          <stringProp name="Assertion.scope">all</stringProp>
         </XPathAssertion>
         <hashTree/>
         <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = '3.1.02'
+  VERSION = '3.1.03'
 end

data/spec/http_cache_manager_spec.rb

@@ -14,4 +14,16 @@ describe 'http_cache_manager' do
       expect(cache_fragment.search(".//boolProp[@name='clearEachIteration']").first.text).to eq 'true'
     end
   end
+
+  describe 'the use_expires option should be respected' do
+    let(:doc) do
+      test do
+        cache use_expires: true
+      end.to_doc
+    end
+     let(:cache_fragment) { doc.search("//CacheManager") }
+     it 'should match on useExpires' do
+      expect(cache_fragment.search(".//boolProp[@name='useExpires']").first.text).to eq 'true'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 3.1.02
+  version: 3.1.03
 platform: ruby
 authors:
 - Tim Koopmans