ruby-jmeter 2.11.0 → 2.11.1

data/lib/ruby-jmeter/dsl.rb

@@ -310,6 +310,17 @@ module RubyJmeter
 
     alias_method :think_time, :random_timer
 
+    def constant_throughput_timer(params, &block)
+      params[:value] ||= params[:throughput] || 0.0
+
+      node = RubyJmeter::ConstantThroughputTimer.new(params)
+      node.doc.xpath(".//value").first.content = params[:value].to_f
+
+      attach_node(node, &block)
+    end
+
+    alias_method :ConstantThroughputTimer, :constant_throughput_timer
+
     def response_assertion(params={}, &block)
       params[:test_type] = parse_test_type(params)
       params["0"] = params.values.first
@@ -399,8 +410,9 @@ module RubyJmeter
     def run(params={})
       file(params)
       logger.warn "Test executing locally ..."
-      properties = params[:properties] || "#{File.dirname(__FILE__)}/helpers/jmeter.properties"
-      cmd = "#{params[:path]}jmeter #{"-n" unless params[:gui] } -t #{params[:file]} -j #{params[:log] ? params[:log] : 'jmeter.log' } -l #{params[:jtl] ? params[:jtl] : 'jmeter.jtl' } -q #{properties}"
+      properties = params.has_key?(:properties) ? params[:properties] : "#{File.dirname(__FILE__)}/helpers/jmeter.properties"
+      properties = "-q #{properties}" if properties
+      cmd = "#{params[:path]}jmeter #{"-n" unless params[:gui] } -t #{params[:file]} -j #{params[:log] ? params[:log] : 'jmeter.log' } -l #{params[:jtl] ? params[:jtl] : 'jmeter.jtl' } #{properties}"
       logger.debug cmd if params[:debug]
       Open3.popen2e("#{cmd}") do |stdin, stdout_err, wait_thr|
         while line = stdout_err.gets

data/lib/ruby-jmeter/helpers/parser.rb

@@ -72,7 +72,7 @@ module RubyJmeter
         :value => Nokogiri::XML(<<-EOF.strip_heredoc).children
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">#{params[:raw_body]}</stringProp>
+            <stringProp name="Argument.value">#{params[:raw_body].encode(:xml => :text)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           EOF

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.11.0"
+  VERSION = "2.11.1"
 end

data/spec/dsl_spec.rb

@@ -681,4 +681,72 @@ describe "DSL" do
     end
 
   end
+
+  describe 'raw body containing xml entities' do
+    let(:doc) do
+      test do
+        threads do
+          post url: 'http://example.com', raw_body: 'username=my_name&password=my_password&email="my name <test@example.com>"'
+        end
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//HTTPSamplerProxy").first }
+
+    it 'escape raw_body' do
+      fragment.search(".//stringProp[@name='Argument.value']").text.should == 'username=my_name&password=my_password&email="my name <test@example.com>"'
+    end
+  end
+
+  describe 'constant_throughput_timer' do
+    let(:doc) do
+      test do
+        threads do
+          constant_throughput_timer value: 60.0
+          constant_throughput_timer throughput: 70.0
+        end
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//ConstantThroughputTimer").first }
+
+    it 'should match on throughput using value' do
+      fragment.search("//doubleProp/value").first.text.should == '60.0'
+    end
+
+    it 'should match on throughput using throughput' do
+      fragment.search("//doubleProp/value").last.text.should == '70.0'
+    end
+  end
+
+  describe 'run' do
+    let(:deflate_properties) {
+      File.expand_path('../../lib/ruby-jmeter/helpers/jmeter.properties', __FILE__)
+    }
+
+    it 'pass a properties file' do
+      Open3.should_receive(:popen2e)
+           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl -q my-jmeter.properties')
+
+      test do
+      end.run(properties: 'my-jmeter.properties')
+    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}")
+
+      test do
+      end.run
+    end
+
+    it 'pass a nil properties file' do
+      Open3.should_receive(:popen2e)
+           .with('jmeter -n -t jmeter.jmx -j jmeter.log -l jmeter.jtl ')
+
+      test do
+      end.run(properties: nil)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client