ruby-jmeter 2.11.10 → 2.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4773c5365592998c6d1cc60058034d36fbcf6a10
-  data.tar.gz: 1720ec95ab23cb8f6d51bef69ea0985af00df34d
+  metadata.gz: eca901af7971565233871283172ae07dc5cd15bf
+  data.tar.gz: 13db5eeaf05cae1a9a0ec13daf508ed1422171f7
 SHA512:
-  metadata.gz: b33d8bdff32b78d969fb16e5525d2177f1b2af775d6570ac71cc2d8594ff0235a710415076fc929dc331eb3a866f0f1670ca7b02026f5c06ec905f3c6acd61cd
-  data.tar.gz: d00d654d034c7de1d4f97147b8d1d274471e35912fb8d62d6d2c85c090fd4130c8b15a577e08d138930dbf9ee7f11af9a32af8cb0226ff7bc3eae8d9bca795c6
+  metadata.gz: 74c809f63d71cb7273ce15cdf20d5adb1ac8c0e0a1e466b1e99f99ebf3f8e399a851b219cc2f50b59ca69560f3d2c443f75c16d3ff2ec250b8f9f9368e679478
+  data.tar.gz: 06e5aa4a6e85a3842df98d22e17647e628c0c9a37effdf0c855875c07bc5da036db520d452ae44e3949cc32de4fa7803526b00725d8c9919c4b3a693820f97d3

data/examples/basic_test_fragment.rb

@@ -0,0 +1,14 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ruby-jmeter'
+
+test do
+
+  test_fragment name: 'anonymous_user', enabled: false do
+    get name: 'Home Page', url: 'http://google.com'
+  end
+
+  threads count: 1 do
+    module_controller test_fragment: 'WorkBench/TestPlan/anonymous_user'
+  end
+
+end.run(path: '/usr/share/jmeter-2.11/bin/', gui: true)

data/lib/ruby-jmeter/DSL.md

@@ -37,6 +37,8 @@
   `tcp_sampler_config`
 - User Defined Variables
   `user_defined_variables`
+- Test Fragment
+  `test_fragment`
 - Thread Group
   `thread_group`
 - ForEach Controller

data/lib/ruby-jmeter/dsl.rb

@@ -262,8 +262,14 @@ module RubyJmeter
     def module_controller(params, &block)
       node = RubyJmeter::ModuleController.new(params)
 
-      node_path = params.kind_of?(Array) ? [] : (params[:node_path] || [])
-      node_path.each_with_index do |node_name, index|
+      if params[:test_fragment]
+        params[:test_fragment].kind_of?(String) &&
+        params[:test_fragment].split('/')
+      elsif params[:node_path]
+        params[:node_path]
+      else
+        []
+      end.each_with_index do |node_name, index|
         node.doc.at_xpath('//collectionProp') <<
           Nokogiri::XML(<<-EOS.strip_heredoc).children
             <stringProp name="node_#{index}">#{node_name}</stringProp>

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

@@ -0,0 +1,23 @@
+module RubyJmeter
+  class DSL
+    def test_fragment(params={}, &block)
+      node = RubyJmeter::TestFragment.new(params)
+      attach_node(node, &block)
+    end
+  end
+
+  class TestFragment
+    attr_accessor :doc
+    include Helper
+
+    def initialize(params={})
+      testname = params.kind_of?(Array) ? 'TestFragment' : (params[:name] || 'TestFragment')
+      @doc = Nokogiri::XML(<<-EOS.strip_heredoc)
+<TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="#{testname}" enabled="false"/>)
+      EOS
+      update params
+      update_at_xpath params if params.is_a?(Hash) && params[:update_at_xpath]
+    end
+  end
+
+end

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

@@ -17,6 +17,7 @@ module RubyJmeter
   module Helper
     def update(params)
       params.delete(:name)
+      enabled_disabled(params)
       if params.class == Array
         update_collection params
       else
@@ -32,6 +33,11 @@ module RubyJmeter
       end
     end
 
+    def enabled_disabled(params)
+      return unless params.is_a?(Hash)
+      @doc.children.first.attributes['enabled'].value = params[:enabled].to_s.empty? ? 'true' : 'false'
+    end
+
     def update_at_xpath(params)
       params[:update_at_xpath].each do |fragment|
         @doc.at_xpath(fragment[:xpath]) << fragment[:value]

data/lib/ruby-jmeter/idl.xml

@@ -241,6 +241,8 @@
         <stringProp name="TestPlan.comments"> </stringProp>
       </Arguments>
       <hashTree/>
+      <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="true"/>
+      <hashTree/>
       <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">

data/lib/ruby-jmeter/version.rb

@@ -1,3 +1,3 @@
 module RubyJmeter
-  VERSION = "2.11.10"
+  VERSION = "2.11.11"
 end

data/spec/dsl_spec.rb

@@ -84,6 +84,21 @@ describe "DSL" do
   end
 
 
+  describe 'disabled elements' do
+    let(:doc) do
+      test do
+        header name: 'Accept', value: '*', enabled: false
+      end.to_doc
+    end
+
+    let(:fragment) {  doc.search("//HeaderManager") }
+
+    it 'should be disabled' do
+      fragment.first.attributes['enabled'].value.should == 'false'
+    end
+  end
+
+
   describe 'header manager' do
     let(:doc) do
       test do
@@ -121,6 +136,7 @@ describe "DSL" do
     end
   end
 
+
   describe 'the clear_each_iteration option should be respected' do
     let(:doc) do
       test do
@@ -138,6 +154,7 @@ describe "DSL" do
     end
   end
 
+
   describe 'test plan' do
     it 'should allow to take params' do
       test_plan = test({"TestPlan.serialize_threadgroups" => "false"}) {}
@@ -301,6 +318,7 @@ describe "DSL" do
     end
   end
 
+
   describe 'visit raw_path' do
     let(:doc) do
       test do
@@ -606,6 +624,7 @@ describe "DSL" do
     end
   end
 
+
   describe 'regex extract' do
     let(:doc) do
       test do
@@ -754,6 +773,7 @@ describe "DSL" do
 
   end
 
+
   describe 'raw body containing xml entities' do
     let(:doc) do
       test do
@@ -770,6 +790,7 @@ describe "DSL" do
     end
   end
 
+
   describe 'constant_throughput_timer' do
     let(:doc) do
       test do
@@ -791,6 +812,7 @@ describe "DSL" do
     end
   end
 
+
   describe 'run' do
     let(:deflate_properties) {
       File.expand_path('../../lib/ruby-jmeter/helpers/jmeter.properties', __FILE__)
@@ -838,6 +860,7 @@ describe "DSL" do
 
   end
 
+
   describe 'module controllers' do
     let(:doc) do
       test name: 'tests' do
@@ -859,7 +882,6 @@ describe "DSL" do
     let(:test_module) { doc.search("//ModuleController").first }
     let(:nodes) { test_module.search(".//stringProp") }
 
-
     it 'should have a node path' do
       nodes.length.should == 4
       nodes[0].text.should == 'WorkBench'
@@ -869,4 +891,29 @@ describe "DSL" do
     end
   end
 
+
+  describe 'module controllers with test fragment' do
+    let(:doc) do
+      test do
+        test_fragment name: 'some_test_fragment', enabled: 'false' do
+          get name: 'Home Page', url: 'http://google.com'
+        end
+
+        threads count: 1 do
+          module_controller test_fragment: 'WorkBench/TestPlan/some_test_fragment'
+        end
+      end.to_doc
+    end
+
+    let(:simple_controller) { doc.search("//GenericController").first }
+    let(:test_module) { doc.search("//ModuleController").first }
+    let(:nodes) { test_module.search(".//stringProp") }
+
+    it 'should have a node path specified by test fragment' do
+      nodes.length.should == 3
+      nodes[0].text.should == 'WorkBench'
+      nodes[1].text.should == 'TestPlan'
+      nodes[2].text.should == 'some_test_fragment'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jmeter
 version: !ruby/object:Gem::Version
-  version: 2.11.10
+  version: 2.11.11
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -80,6 +80,7 @@ files:
 - examples/basic_query_params.rb
 - examples/basic_run.rb
 - examples/basic_simple_data_writer.rb
+- examples/basic_test_fragment.rb
 - examples/basic_testdata.rb
 - examples/basic_think_time.rb
 - examples/basic_throughput_controller.rb
@@ -194,6 +195,7 @@ files:
 - lib/ruby-jmeter/dsl/tcp_sampler.rb
 - lib/ruby-jmeter/dsl/tcp_sampler_config.rb
 - lib/ruby-jmeter/dsl/test_action.rb
+- lib/ruby-jmeter/dsl/test_fragment.rb
 - lib/ruby-jmeter/dsl/test_plan.rb
 - lib/ruby-jmeter/dsl/thread_group.rb
 - lib/ruby-jmeter/dsl/throughput_controller.rb