ruby-jmeter 2.11.4 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5bc1f6b2c1312ab7e9922978ee213d39deef0a8
-  data.tar.gz: 0e8446660a68a200b541c13ba7db7217a66cf377
+  metadata.gz: 6d6fa9fb9703eb230c92bf837ff1f0dfe98d8fe0
+  data.tar.gz: 63d62ea17960c6ba6e6ac538e92987841cc2267d
 SHA512:
-  metadata.gz: 071962a0464223aecd0ad7314e631affc67ac582fb321172051cbce5e72c4533e71e57f2a503d7ea61ceea7964d87bfc14d60449e6f3cf051cab9001ae17bf00
-  data.tar.gz: 6693613ecb51856faa38aefa2ca33c40516cc76ce1f316af497c59d824fcf126d29c3620442755604089bbdb6ae8aedf8860ad4c3e0466a32950e8ab9dc92a96
+  metadata.gz: 0d377a9d968acf5c6e8bf5657341e07a3faedbf77c4d048bba52adc69969c4cdfd7ead98686c98b63048c4e7a9a64a8ab1da57a92a1e65ad1747b207c33bbe26
+  data.tar.gz: 47a25ef52dba2f9ad0318083d4b5baaf95edc816263a5425da642e4168b806b3d7c1ebe22fdec973738a999baaaddc53f507905f110c0aa1442f7768c9c567c5

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p484
+2.0.0-p353

data/examples/basic_http_request_with_files.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+test do
+  threads do
+    transaction name: "TC_03", parent: true, include_timers: true do
+      submit url: "/", fill_in: { username: 'tim', password: 'password' },
+             files: [{path: '/tmp/foo', paramname: 'fileup', mimetype: 'text/plain'},
+                     {path: '/tmp/bar', paramname: 'otherfileup'}]
+    end
+  end
+end

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

@@ -16,6 +16,7 @@ module RubyJmeter
 
       fill_in(params) if params.has_key?(:fill_in)
       raw_body(params) if params.has_key?(:raw_body)
+      files(params) if params.has_key?(:files)
     end
 
     def parse_url(params)
@@ -80,6 +81,29 @@ module RubyJmeter
       params.delete(:raw_body)
     end
 
+    def files(params)
+      files = params.delete(:files)
+      return if files.empty?
+      x = Nokogiri::XML::Builder.new do |b|
+        b.elementProp(name: "HTTPsampler.Files", elementType: "HTTPFileArgs") {
+          b.collectionProp(name: "HTTPFileArgs.files") {
+            files.each do |f|
+              b.elementProp(name: f[:path], elementType: "HTTPFileArg") {
+                b.stringProp f[:path] || '' , name: "File.path"
+                b.stringProp f[:paramname] || '' , name: "File.paramname"
+                b.stringProp f[:mimetype] || '' , name: "File.mimetype"
+              }
+            end
+          }
+        }
+      end
+      params[:update_at_xpath] ||= []
+      params[:update_at_xpath] << {
+        :xpath => '//HTTPSamplerProxy',
+        :value => x.doc.root
+      }
+    end
+
     def parse_test_type(params)
       case params.keys.first
       when 'contains'

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.11.4"
+  VERSION = "2.11.5"
 end

data/spec/dsl_spec.rb

@@ -451,6 +451,36 @@ describe "DSL" do
     it 'should match on POST' do
       fragment.search(".//stringProp[@name='HTTPSampler.method']").text.should == 'POST'
     end
+
+    it 'should have no files' do
+      fragment.search(".//elementProp[@name='HTTPsampler.Files']").length.should == 0
+    end
+
+  end
+
+
+  describe 'submit_with_files' do
+    let(:doc) do
+      test do
+        threads do
+          transaction name: "TC_03", parent: true, include_timers: true do
+            submit url: "/", fill_in: { username: 'tim', password: 'password' },
+                   files: [{path: '/tmp/foo', paramname: 'fileup', mimetype: 'text/plain'},
+                           {path: '/tmp/bar', paramname: 'otherfileup'}]
+          end
+        end
+      end.to_doc
+    end
+
+    let(:fragment) { doc.search("//HTTPSamplerProxy/elementProp[@name='HTTPsampler.Files']").first }
+
+    it 'should have two files' do
+      fragment.search("./collectionProp/elementProp[@elementType='HTTPFileArg']").length.should == 2
+    end
+
+    it 'should have one empty mimetype' do
+      fragment.search("./collectionProp/elementProp[@elementType='HTTPFileArg']/stringProp[@name='File.mimetype' and normalize-space(.) = '']").length.should == 1
+    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.5
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -71,6 +71,7 @@ files:
 - examples/basic_har.rb
 - examples/basic_header.rb
 - examples/basic_http_request_defaults.rb
+- examples/basic_http_request_with_files.rb
 - examples/basic_ldap_ext.rb
 - examples/basic_meta_fu.rb
 - examples/basic_post.rb