ruby-jmeter 2.13.5 → 2.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc45180e9ae9b2911cbe73279e54fe7a367b33b
-  data.tar.gz: 9e1d2afeb4dcaf99274a2b3804717fdcfa2134ed
+  metadata.gz: 1aba397b4e80c6a55097ab98a90b1d4349a833c9
+  data.tar.gz: 380054d564616ec16f3f5e7c29d5c1ffb34df146
 SHA512:
-  metadata.gz: 5c7322a18414e08695dbd0eb280af2423580c65cf801e7b5d89345f171016ad2a80f1f42a60a74a7705216cf33c755813b91ffb19930cd35cede75a26f9ee7d1
-  data.tar.gz: 6db79206bc45f66291c0f58ea3d84ede37e67d4e733ee307bf176fc4d4f2a110d7b03ff2798440d56bd993c2a6c9061a728fc5bbc7457a4ed85bc1bea662ca94
+  metadata.gz: 085d457e7c39d09c50547b218000fd8656e1753a080f76b511f603be355be1168b0822b88d876e3e6b7027ae15d8d762dc1b450377a0d839a9ba8a0e5ac66134
+  data.tar.gz: 13e6162f551447c0806923bfb46755e6f027a04aa144099cec2265bf1b7c6e9ca85d6ba589f2d98e31cc447bb990c5e4dc132cf83b018ef6d0c8e9b1fa67504b

data/lib/ruby-jmeter/DSL.md

@@ -223,8 +223,6 @@
   `monitor_results`
 - Response Time Graph
   `response_time_graph`
-- Response Time Graph
-  `response_time_graph`
 - Save Responses to a file
   `save_responses_to_a_file`
 - Simple Data Writer

data/lib/ruby-jmeter/dsl.rb

@@ -402,6 +402,10 @@ module RubyJmeter
       params[:test_type] = parse_test_type(params)
       params['0'] = params.values.first
       node = RubyJmeter::ResponseAssertion.new(params)
+      if params[:variable] then
+        params['Scope.variable'] = params[:variable]
+        node.doc.xpath("//stringProp[@name='Assertion.scope']").first.content = 'variable'
+      end
       node.doc.xpath("//stringProp[@name='Assertion.scope']").remove if
         params[:scope] == 'main' || params['scope'] == 'main'
       attach_node(node, &block)
@@ -486,8 +490,8 @@ module RubyJmeter
 
     alias_method :active_threads, :active_threads_over_time
 
-    def perfmon_collector(name, params = {}, &block)
-      node = RubyJmeter::Plugins::PerfmonCollector.new(name, params)
+    def perfmon_collector(name, params = {}, filename="perfMon.jtl", &block)
+      node = RubyJmeter::Plugins::PerfmonCollector.new(name, params, filename)
       attach_node(node, &block)
     end
 
@@ -524,8 +528,7 @@ module RubyJmeter
     def run(params = {})
       file(params)
       logger.warn "Test executing locally ..."
-      properties = params.has_key?(:properties) ? params[:properties] : "#{File.dirname(__FILE__)}/helpers/jmeter.properties"
-      properties = "-q #{properties}" if properties
+      properties = params.has_key?(:properties) ? build_properties(params[:properties]) : "-q #{File.dirname(__FILE__)}/helpers/jmeter.properties"
 
       if params[:remote_hosts]
         remote_hosts = params[:remote_hosts]
@@ -635,6 +638,14 @@ module RubyJmeter
       Nokogiri::XML(@root.to_s, &:noblanks)
     end
 
+    def build_properties(properties)
+      if properties.kind_of?(String)
+        "-q #{properties}"
+      elsif properties.kind_of?(Hash)
+        properties.map{ |k,v| "-J#{k}=#{v}" }.join(" ")
+      end
+    end
+
     def logger
       @log       ||= Logger.new(STDOUT)
       @log.level = Logger::DEBUG

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

@@ -21,6 +21,7 @@ module RubyJmeter
   <boolProp name="Assertion.assume_success">false</boolProp>
   <intProp name="Assertion.test_type">16</intProp>
   <stringProp name="Assertion.scope">all</stringProp>
+  <stringProp name="Scope.variable"></stringProp>
 </ResponseAssertion>)
       EOS
       update params

data/lib/ruby-jmeter/plugins/dummy_sampler.rb

@@ -5,7 +5,7 @@ module RubyJmeter
       include Helper
       def initialize(name, params={})
         @doc = Nokogiri::XML(<<-EOF.strip_heredoc)
-          <kg.apc.jmeter.samplers.DummySampler guiclass="kg.apc.jmeter.samplers.DummySamplerGui" testclass="kg.apc.jmeter.samplers.DummySampler" testname="jp@gc - Dummy Sampler" enabled="true">
+          <kg.apc.jmeter.samplers.DummySampler guiclass="kg.apc.jmeter.samplers.DummySamplerGui" testclass="kg.apc.jmeter.samplers.DummySampler" testname="#{name}" enabled="true">
           <boolProp name="WAITING">true</boolProp>
           <boolProp name="SUCCESFULL">true</boolProp>
           <stringProp name="RESPONSE_CODE">200</stringProp>

data/lib/ruby-jmeter/plugins/perfmon_collector.rb

@@ -3,7 +3,7 @@ module RubyJmeter
     class PerfmonCollector
       attr_accessor :doc
       include Helper
-      def initialize(name, params={})
+      def initialize(name, params={}, filename="perfMon.jtl")
         metricNodes = params.collect do |m|
           "
             <collectionProp name=\"\">
@@ -41,7 +41,7 @@ module RubyJmeter
                 <subresults>false</subresults>
                 <responseData>false</responseData>
                 <samplerData>false</samplerData>
-                <xml>false</xml>
+                <xml>true</xml>
                 <fieldNames>false</fieldNames>
                 <responseHeaders>false</responseHeaders>
                 <requestHeaders>false</requestHeaders>
@@ -53,7 +53,7 @@ module RubyJmeter
                 <sampleCount>true</sampleCount>
               </value>
             </objProp>
-            <stringProp name="filename"></stringProp>
+            <stringProp name="filename">#{filename}</stringProp>
             <longProp name="interval_grouping">1000</longProp>
             <boolProp name="graph_aggregated">false</boolProp>
             <stringProp name="include_sample_labels"></stringProp>

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = '2.13.5'
+  VERSION = '2.13.6'
 end

data/spec/dsl_spec.rb

@@ -759,6 +759,26 @@ describe 'DSL' do
         fragment.search(".//stringProp[@name='Assertion.scope']").text.should == ""
       end
     end
+
+    describe 'scope variable' do
+      let(:doc) do
+        test do
+          visit '/' do
+            assert contains: 'someting', variable: 'some_jmeter_variable'
+          end
+        end.to_doc
+      end
+
+      let(:fragment) { doc.search("//ResponseAssertion").first }
+
+      it 'should match on scope' do
+        fragment.search(".//stringProp[@name='Assertion.scope']").text.should == "variable"
+      end
+
+      it 'should match on variable' do
+        fragment.search(".//stringProp[@name='Scope.variable']").text.should == "some_jmeter_variable"
+      end
+    end
   end
 
   describe 'Nested controllers' do
@@ -853,6 +873,22 @@ describe 'DSL' do
       end.run(properties: 'my-jmeter.properties')
     end
 
+    it 'pass an inline property' do
+      Open3.should_receive(:popen2e)
+           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl -Jjmeter.save.saveservice.output_format=xml ')
+
+      test do
+      end.run(properties: {"jmeter.save.saveservice.output_format" => "xml"})
+    end
+
+    it 'pass multiple inline properties' do
+      Open3.should_receive(:popen2e)
+           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl -Jtlon=uqbar -Jorbis=tertius ')
+
+      test do
+      end.run(properties: {tlon: "uqbar", orbis: "tertius"})
+    end
+
     it 'do not pass a properties file' do
       Open3.should_receive(:popen2e)
            .with("jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl -q #{deflate_properties} ")
@@ -940,4 +976,25 @@ describe 'DSL' do
       nodes[2].text.should == 'some_test_fragment'
     end
   end
+
+  describe 'dummy sampler' do
+    let(:doc) do
+      test do
+        threads do
+          dummy_sampler 'dummy sampler name', { RESPONSE_DATA: "Some response data" }
+        end
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//kg.apc.jmeter.samplers.DummySampler").first }
+
+    it 'should match on name' do
+      fragment.attributes['testname'].value.should == 'dummy sampler name'
+    end
+
+    it 'should match on response data' do
+      fragment.search("//stringProp[@name='RESPONSE_DATA']").text.should == 'Some response data'
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.13.5
+  version: 2.13.6
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client