jenkins_api_client 0.12.1 → 0.13.0

data/lib/jenkins_api_client/node.rb

@@ -90,6 +90,7 @@ module JenkinsApi
       #
       def initialize(client)
         @client = client
+        @logger = @client.logger
       end
 
       # Gives the string representation of the Object
@@ -121,16 +122,13 @@ module JenkinsApi
       #   )
       #
       def create_dump_slave(params)
-
-        if list.include?(params[:name])
-          raise "The specified slave '#{params[:name]}' already exists."
-        end
-
         unless params[:name] && params[:slave_host] && params[:private_key_file]
-          raise "Name, slave host, and private key file are required for" +
-            " creating a slave."
+          raise ArgumentError, "Name, slave host, and private key file are" +
+            " required for creating a slave."
         end
 
+        @logger.info "Creating a dump slave '#{params[:name]}'"
+        @logger.debug "Creating a dump slave with params: #{params.inspect}"
         default_params = {
           :description => "Automatically created through jenkins_api_client",
           :executors => 2,
@@ -170,7 +168,8 @@ module JenkinsApi
             }
           }.to_json
         }
-
+        @logger.debug "Modified params posted to create slave:" +
+          " #{post_params.inspect}"
         @client.api_post_request("/computer/doCreateItem", post_params)
       end
 
@@ -179,6 +178,7 @@ module JenkinsApi
       # @param [String] node_name Name of the node to delete
       #
       def delete(node_name)
+        @logger.info "Deleting node '#{node_name}'"
         if list.include?(node_name)
           @client.api_post_request("/computer/#{node_name}/doDelete")
         else
@@ -193,6 +193,7 @@ module JenkinsApi
       #       caution.
       #
       def delete_all!
+        @logger.info "Deleting all nodes (except master) from jenkins"
         list.each { |node| delete(node) unless node == "master" }
       end
 
@@ -202,6 +203,7 @@ module JenkinsApi
       # @param [Bool] ignorecase whether to be case sensitive or not
       #
       def list(filter = nil, ignorecase = true)
+        @logger.info "Obtaining nodes from jenkins matching filter '#{filter}'"
         node_names = []
         response_json = @client.api_get_request("/computer")
         response_json["computer"].each do |computer|
@@ -227,6 +229,7 @@ module JenkinsApi
       #
       GENERAL_ATTRIBUTES.each do |meth_suffix|
         define_method("get_#{meth_suffix}") do
+          @logger.info "Obtaining '#{meth_suffix}' attribute from jenkins"
           response_json = @client.api_get_request("/computer")
           response_json["#{meth_suffix}"]
         end
@@ -236,6 +239,7 @@ module JenkinsApi
       #
       NODE_PROPERTIES.each do |meth_suffix|
         define_method("is_#{meth_suffix}?") do |node_name|
+          @logger.info "Obtaining '#{meth_suffix}' property of '#{node_name}'"
           response_json = @client.api_get_request("/computer")
           resp = response_json["computer"][index(node_name)]["#{meth_suffix}"]
           resp =~ /False/i ? false : true
@@ -245,6 +249,7 @@ module JenkinsApi
       # Defines methods for node specific attributes.
       NODE_ATTRIBUTES.each do |meth_suffix|
         define_method("get_node_#{meth_suffix}") do |node_name|
+          @logger.info "Obtaining '#{meth_suffix}' attribute of '#{node_name}'"
           response_json = @client.api_get_request("/computer")
           response_json["computer"][index(node_name)]["#{meth_suffix}"]
         end
@@ -256,6 +261,7 @@ module JenkinsApi
       # @param [String] mode mode to change to
       #
       def change_mode(node_name, mode)
+        @logger.info "Changing the mode of '#{node_name}' to '#{mode}'"
         mode = mode.upcase
         xml = get_config(node_name)
         n_xml = Nokogiri::XML(xml)
@@ -270,6 +276,7 @@ module JenkinsApi
       # @param [String] node_name name of the node
       #
       def get_config(node_name)
+        @logger.info "Obtaining the config.xml of node '#{node_name}'"
         node_name = "(master)" if node_name == "master"
         @client.get_config("/computer/#{node_name}")
       end
@@ -280,6 +287,7 @@ module JenkinsApi
       # @param [String] xml Config.xml of the node
       #
       def post_config(node_name, xml)
+        @logger.info "Posting the config.xml of node '#{node_name}'"
         node_name = "(master)" if node_name == "master"
         @client.post_config("/computer/#{node_name}/config.xml", xml)
       end

data/lib/jenkins_api_client/system.rb

@@ -35,6 +35,8 @@ module JenkinsApi
       #
       def initialize(client)
         @client = client
+        @logger = @client.logger
+        @timeout = @client.timeout
       end
 
       # Returns a string representation of System class.
@@ -46,12 +48,14 @@ module JenkinsApi
       # Sends a quiet down request to the server.
       #
       def quiet_down
+        @logger.info "Performing a quiet down of jenkins..."
         @client.api_post_request("/quietDown")
       end
 
       # Cancels the quiet doen request sent to the server.
       #
       def cancel_quiet_down
+        @logger.info "Cancelling jenkins form quiet down..."
         @client.api_post_request("/cancelQuietDown")
       end
 
@@ -62,8 +66,10 @@ module JenkinsApi
       #
       def restart(force = false)
         if force
+          @logger.info "Performing a force restart of jenkins..."
           @client.api_post_request("/restart")
         else
+          @logger.info "Performing a safe restart of jenkins..."
           @client.api_post_request("/safeRestart")
         end
       end
@@ -71,17 +77,30 @@ module JenkinsApi
       # Reload the Jenkins server
       #
       def reload
+        @logger.info "Reloading jenkins..."
         @client.api_post_request("/reload")
       end
 
+      # List all users known to Jenkins by their Full Name
+      #
+      def list_users
+        @logger.info "Obtaining the list of users from jenkins"
+        users = @client.api_get_request("/asynchPeople")
+        names = []
+        users['users'].each { |user|
+          names << user['user']['fullName']
+        } unless users.nil?
+        return names
+      end
+
       # This method waits till the server becomes ready after a start
       # or restart.
       #
       def wait_for_ready
-        Timeout::timeout(@client.timeout) do
+        Timeout::timeout(@timeout) do
           while true do
             response = @client.get_root
-            puts "[INFO] Waiting for jenkins to restart..." if @client.debug
+            @logger.info "Waiting for jenkins to restart..."
             if (response.body =~ /Please wait while Jenkins is restarting/ ||
               response.body =~ /Please wait while Jenkins is getting ready to work/)
               sleep 30

data/lib/jenkins_api_client/version.rb

@@ -25,9 +25,9 @@ module JenkinsApi
     # Major version of the gem
     MAJOR   = 0
     # Minor version of the gem
-    MINOR   = 12
+    MINOR   = 13
     # Tiny version of the gem used for patches
-    TINY    = 1
+    TINY    = 0
     # Used for pre-releases
     PRE     = nil
     # Version String of Jenkins API Client.

data/lib/jenkins_api_client/view.rb

@@ -34,6 +34,7 @@ module JenkinsApi
       #
       def initialize(client)
         @client = client
+        @logger = @client.logger
       end
 
       # Return a string representation of the object
@@ -49,6 +50,7 @@ module JenkinsApi
       # listview, myview. Default: listview
       #
       def create(view_name, type = "listview")
+        @logger.info "Creating a view '#{view_name}' of type '#{type}'"
         mode = case type
         when "listview"
           "hudson.model.ListView"
@@ -81,8 +83,15 @@ module JenkinsApi
       # @option params [String] :regex Regular expression to filter jobs that
       #         are to be added to the view
       #
+      # @raise [ArgumentError] if the required parameter +:name+ is not
+      #   specified
+      #
       def create_list_view(params)
+        # Name is a required parameter. Raise an error if not specified
+        raise ArgumentError, "Name is required for creating view" \
+          unless params.is_a?(Hash) && params[:name]
         create(params[:name], "listview")
+        @logger.debug "Creating a list view with params: #{params.inspect}"
         status_filter = case params[:status_filter]
         when "all_selected_jobs"
           ""
@@ -148,6 +157,7 @@ module JenkinsApi
       # @param [String] view_name
       #
       def delete(view_name)
+        @logger.info "Deleting view '#{view_name}'"
         @client.api_post_request("/view/#{view_name}/doDelete")
       end
 
@@ -157,6 +167,7 @@ module JenkinsApi
       #       in Jenkins. Please use with caution.
       #
       def delete_all!
+        @logger.info "Deleting all views from jenkins"
         list.each { |view| delete(view) unless view == "All"}
       end
 
@@ -166,8 +177,9 @@ module JenkinsApi
       # @param [Bool] ignorecase whether to be case sensitive or not
       #
       def list(filter = "", ignorecase = true)
+        @logger.info "Obtaining views based on filter '#{filter}'"
         view_names = []
-        response_json = @client.api_get_request("/")
+        response_json = @client.api_get_request("")
         response_json["views"].each { |view|
           if ignorecase
             view_names << view["name"] if view["name"] =~ /#{filter}/i
@@ -193,6 +205,7 @@ module JenkinsApi
       # @return [Array] job_names list of jobs in the specified view
       #
       def list_jobs(view_name)
+        @logger.info "Obtaining the jobs present in view '#{view_name}'"
         job_names = []
         raise "The view #{view_name} doesn't exists on the server"\
           unless exists?(view_name)
@@ -209,6 +222,7 @@ module JenkinsApi
       # @param [String] job_name
       #
       def add_job(view_name, job_name)
+        @logger.info "Adding job '#{job_name}' to view '#{view_name}'"
         post_msg = "/view/#{view_name}/addJobToView?name=#{job_name}"
         @client.api_post_request(post_msg)
       end
@@ -219,6 +233,7 @@ module JenkinsApi
       # @param [String] job_name
       #
       def remove_job(view_name, job_name)
+        @logger.info "Removing job '#{job_name}' from view '#{view_name}'"
         post_msg = "/view/#{view_name}/removeJobFromView?name=#{job_name}"
         @client.api_post_request(post_msg)
       end
@@ -228,6 +243,7 @@ module JenkinsApi
       # @param [String] view_name
       #
       def get_config(view_name)
+        @logger.info "Obtaining the configuration of view '#{view_name}'"
         @client.get_config("/view/#{view_name}")
       end
 
@@ -237,6 +253,7 @@ module JenkinsApi
       # @param [String] xml
       #
       def post_config(view_name, xml)
+        @logger.info "Posting the configuration of view '#{view_name}'"
         @client.post_config("/view/#{view_name}/config.xml", xml)
       end
 

data/spec/func_tests/client_spec.rb

@@ -27,13 +27,6 @@ describe JenkinsApi::Client do
 
     describe "InstanceMethods" do
 
-      describe "#debug" do
-        it "Should be able to toggle the debug value" do
-          value = @client.debug
-          @client.toggle_debug.should_not == value
-        end
-      end
-
       describe "#initialize" do
         it "Should be able to initialize with valid credentials" do
           client1 = JenkinsApi::Client.new(
@@ -50,14 +43,15 @@ describe JenkinsApi::Client do
         end
 
         it "Should fail if wrong credentials are given" do
-          begin
-            client2 = JenkinsApi::Client.new(:server_ip => @server_ip,
-                                             :username => 'stranger',
-                                             :password => 'hacked')
-            client2.job.list_all
-          rescue Exception => e
-            e.class.should == JenkinsApi::Exceptions::UnautherizedException
-          end
+          client2 = JenkinsApi::Client.new(
+            :server_ip => @server_ip,
+            :username => 'stranger',
+            :password => 'hacked',
+            :log_location => '/dev/null'
+          )
+          expect(
+            lambda { client2.job.list_all }
+          ).to raise_error(JenkinsApi::Exceptions::Unauthorized)
         end
       end
       describe "#get_jenkins_version" do

data/spec/func_tests/job_spec.rb

@@ -11,13 +11,13 @@ describe JenkinsApi::Client::Job do
     before(:all) do
       @helper = JenkinsApiSpecHelper::Helper.new
       @creds_file = '~/.jenkins_api_client/spec.yml'
+      @creds = YAML.load_file(File.expand_path(@creds_file, __FILE__))
       @job_name_prefix = 'awesome_rspec_test_job'
       @filter = "^#{@job_name_prefix}.*"
       @job_name = ''
+      @valid_post_responses = [200, 201, 302]
       begin
-        @client = JenkinsApi::Client.new(
-          YAML.load_file(File.expand_path(@creds_file, __FILE__))
-        )
+        @client = JenkinsApi::Client.new(@creds)
       rescue Exception => e
         puts "WARNING: Credentials are not set properly."
         puts e.message
@@ -54,36 +54,66 @@ describe JenkinsApi::Client::Job do
         it "Should be able to create a job by getting an xml" do
           xml = @helper.create_job_xml
           name = "qwerty_nonexistent_job"
-          @client.job.create(name, xml).to_i.should == 200
+          @valid_post_responses.should include(
+            @client.job.create(name, xml).to_i
+          )
+          @client.job.list(name).include?(name).should be_true
+        end
+        it "Should raise proper exception when the job already exists" do
+          xml = @helper.create_job_xml
+          name = "the_duplicate_job"
+          @valid_post_responses.should include(
+            @client.job.create(name, xml).to_i
+          )
           @client.job.list(name).include?(name).should be_true
+          expect(
+            lambda { @client.job.create(name, xml) }
+          ).to raise_error(JenkinsApi::Exceptions::JobAlreadyExists)
+          @valid_post_responses.should include(
+            @client.job.delete(name).to_i
+          )
         end
       end
 
       describe "#create_freestyle" do
 
-        def test_and_validate(name, params)
-          @client.job.create_freestyle(params).to_i.should == 200
+        def test_and_validate(name, params, config_line = nil)
+          @valid_post_responses.should include(
+            @client.job.create_freestyle(params).to_i
+          )
           @client.job.list(name).include?(name).should be_true
-          @client.job.delete(name).to_i.should == 302
+          # Test for the existense of the given line in the config.xml of the
+          # job created
+          unless config_line.nil?
+            config = @client.job.get_config(name)
+            config.should =~ /#{config_line}/
+          end
+          @valid_post_responses.should include(
+            @client.job.delete(name).to_i
+          )
           @client.job.list(name).include?(name).should be_false
         end
 
-        it "Should be able to create a simple freestyle job" do
+        it "Should create a freestyle job with just name" do
           name = "test_job_name_using_params"
           params = {
             :name => name
           }
           test_and_validate(name, params)
         end
-        it "Should be able to create a freestyle job with shell command" do
+        it "Should create a freestyle job with shell command" do
           name = "test_job_using_params_shell"
           params = {
             :name => name,
             :shell_command => "echo this is a free style project"
           }
-          test_and_validate(name, params)
+          test_and_validate(
+            name,
+            params,
+            "<command>echo this is a free style project</command>"
+          )
         end
-        it "Should accept Git SCM provider" do
+        it "Should create a freestyle job with Git SCM provider" do
           name = "test_job_with_git_scm"
           params = {
             :name => name,
@@ -91,9 +121,13 @@ describe JenkinsApi::Client::Job do
             :scm_url => "git://github.com./arangamani/jenkins_api_client.git",
             :scm_branch => "master"
           }
-          test_and_validate(name, params)
+          test_and_validate(
+            name,
+            params,
+            "<url>git://github.com./arangamani/jenkins_api_client.git</url>"
+          )
         end
-        it "Should accept subversion SCM provider" do
+        it "Should create a freestyle job with SVN SCM provider" do
           name = "test_job_with_subversion_scm"
           params = {
             :name => name,
@@ -101,9 +135,13 @@ describe JenkinsApi::Client::Job do
             :scm_url => "http://svn.freebsd.org/base/",
             :scm_branch => "master"
           }
-          test_and_validate(name, params)
+          test_and_validate(
+            name,
+            params,
+            "<remote>http://svn.freebsd.org/base/</remote>"
+          )
         end
-        it "Should accept CVS SCM provider with branch" do
+        it "Should create a freestyle job with CVS SCM provider with branch" do
           name = "test_job_with_cvs_scm_branch"
           params = {
             :name => name,
@@ -112,9 +150,13 @@ describe JenkinsApi::Client::Job do
             :scm_module => "src",
             :scm_branch => "MAIN"
           }
-          test_and_validate(name, params)
+          test_and_validate(
+            name,
+            params,
+            "<cvsroot>http://cvs.NetBSD.org</cvsroot>"
+          )
         end
-        it "Should accept CVS SCM provider with tag" do
+        it "Should create a freestyle job with CVS SCM provider with tag" do
           name = "test_job_with_cvs_scm_tag"
           params = {
             :name => name,
@@ -123,9 +165,13 @@ describe JenkinsApi::Client::Job do
             :scm_module => "src",
             :scm_tag => "MAIN"
           }
-          test_and_validate(name, params)
+          test_and_validate(
+            name,
+            params,
+            "<cvsroot>http://cvs.NetBSD.org</cvsroot>"
+          )
         end
-        it "Should fail if unsupported SCM is specified" do
+        it "Should raise an error if unsupported SCM is specified" do
           name = "test_job_unsupported_scm"
           params = {
             :name => name,
@@ -137,7 +183,7 @@ describe JenkinsApi::Client::Job do
             lambda{ @client.job.create_freestyle(params) }
           ).to raise_error
         end
-        it "Should accept restricted_node option" do
+        it "Should create a freestyle job with restricted_node option" do
           name = "test_job_restricted_node"
           params = {
             :name => name,
@@ -145,7 +191,8 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept block_build_when_downstream_building option" do
+        it "Should create a freestyle job with" +
+          " block_build_when_downstream_building option" do
           name = "test_job_block_build_when_downstream_building"
           params = {
             :name => name,
@@ -153,7 +200,8 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept block_build_when_upstream_building option" do
+        it "Should create a freestyle job with" +
+          " block_build_when_upstream_building option" do
           name = "test_job_block_build_when_upstream_building"
           params = {
             :name => name,
@@ -161,7 +209,7 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept concurrent_build option" do
+        it "Should create a freestyle job with concurrent_build option" do
           name = "test_job_concurrent_build"
           params = {
             :name => name,
@@ -169,7 +217,7 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept the timer option" do
+        it "Should create a freestyle job with timer option" do
           name = "test_job_using_timer"
           params = {
             :name => name,
@@ -177,7 +225,7 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept child projects option" do
+        it "Should create a freestyle job with child projects option" do
           name = "test_job_child_projects"
           params = {
             :name => name,
@@ -186,7 +234,7 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept notification_email option" do
+        it "Should create a freestyle job with notification_email option" do
           name = "test_job_notification_email"
           params = {
             :name => name,
@@ -194,7 +242,8 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept notification for individual skype targets" do
+        it "Should create a freestyle job with notification for" +
+          " individual skype targets" do
           name = "test_job_with_individual_skype_targets"
           params = {
             :name => name,
@@ -202,7 +251,8 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept notification for group skype targets" do
+        it "Should create a freestyle job with notification for" +
+          " group skype targets" do
           name = "test_job_with_group_skype_targets"
           params = {
             :name => name,
@@ -210,7 +260,8 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
-        it "Should accept complex skype configuration" do
+        it "Should create a freestyle job with complex skype" +
+          " configuration" do
           name = "test_job_with_complex_skype_configuration"
           params = {
             :name => name,
@@ -225,31 +276,83 @@ describe JenkinsApi::Client::Job do
           }
           test_and_validate(name, params)
         end
+        it "Should raise an error if the input parameters is not a Hash" do
+          expect(
+            lambda {
+              @client.job.create_freestyle("a_string")
+            }
+          ).to raise_error(ArgumentError)
+        end
+        it "Should raise an error if the required name paremeter is missing" do
+          expect(
+            lambda {
+              @client.job.create_freestyle(:shell_command => "sleep 60")
+            }
+          ).to raise_error(ArgumentError)
+        end
+      end
+
+      describe "#copy" do
+        it "accepts the from and to job name and copies the job" do
+          xml = @helper.create_job_xml
+          @client.job.create("from_job_copy_test", xml)
+          @client.job.copy("from_job_copy_test", "to_job_copy_test")
+          @client.job.list(".*_job_copy_test").should == [
+            "from_job_copy_test", "to_job_copy_test"
+          ]
+          @client.job.delete("from_job_copy_test")
+          @client.job.delete("to_job_copy_test")
+        end
+        it "accepts the from job name and copies the from job to the" +
+          " copy_of_from job" do
+          xml = @helper.create_job_xml
+          @client.job.create("from_job_copy_test", xml)
+          @client.job.copy("from_job_copy_test")
+          @client.job.list(".*_job_copy_test").should == [
+            "copy_of_from_job_copy_test", "from_job_copy_test"
+          ]
+          @client.job.delete("from_job_copy_test")
+          @client.job.delete("copy_of_from_job_copy_test")
+        end
       end
 
       describe "#add_email_notification" do
         it "Should accept email address and add to existing job" do
           name = "email_notification_test_job"
           params = {:name => name}
-          @client.job.create_freestyle(params).to_i.should == 200
-          @client.job.add_email_notification(
-            :name => name,
-            :notification_email => "testuser@testdomain.com"
-          ).to_i.should == 200
-          @client.job.delete(name).to_i.should == 302
+          @valid_post_responses.should include(
+            @client.job.create_freestyle(params).to_i
+          )
+          @valid_post_responses.should include(
+            @client.job.add_email_notification(
+              :name => name,
+              :notification_email => "testuser@testdomain.com"
+            ).to_i
+          )
+          @valid_post_responses.should include(
+            @client.job.delete(name).to_i
+          )
         end
       end
 
       describe "#add_skype_notification" do
         it "Should accept skype configuration and add to existing job" do
           name = "skype_notification_test_job"
-          params = {:name => name}
-          @client.job.create_freestyle(params).to_i.should == 200
-          @client.job.add_skype_notification(
-            :name => name,
-            :skype_targets => "testuser"
-          ).to_i.should == 200
-          @client.job.delete(name).to_i.should == 302
+          params = {
+            :name => name
+          }
+          @valid_post_responses.should include(
+            @client.job.create_freestyle(params).to_i
+          )
+          @valid_post_responses.should include(
+            @client.job.add_skype_notification(
+              :name => name,
+              :skype_targets => "testuser"
+            ).to_i
+          )
+          @valid_post_responses.should include(
+            @client.job.delete(name).to_i
+          )
         end
       end
 
@@ -268,21 +371,37 @@ describe JenkinsApi::Client::Job do
 
       describe "#recreate" do
         it "Should be able to re-create a job" do
-          @client.job.recreate("qwerty_nonexistent_job").to_i.should == 200
+          @valid_post_responses.should include(
+            @client.job.recreate("qwerty_nonexistent_job").to_i
+          )
         end
       end
 
       describe "#change_description" do
         it "Should be able to change the description of a job" do
-          @client.job.change_description("qwerty_nonexistent_job",
-            "The description has been changed by the spec test"
-          ).to_i.should == 200
+          @valid_post_responses.should include(
+            @client.job.change_description("qwerty_nonexistent_job",
+            "The description has been changed by the spec test").to_i
+          )
         end
       end
 
       describe "#delete" do
         it "Should be able to delete a job" do
-          @client.job.delete("qwerty_nonexistent_job").to_i.should == 302
+          @valid_post_responses.should include(
+            @client.job.delete("qwerty_nonexistent_job").to_i
+          )
+        end
+      end
+
+      describe "#wipe_out_workspace" do
+        it "Should be able to wipe out the workspace of a job" do
+          xml = @helper.create_job_xml
+          @client.job.create("wipeout_job_test", xml)
+          @valid_post_responses.should include(
+            @client.job.wipe_out_workspace("wipeout_job_test").to_i
+          )
+          @client.job.delete("wipeout_job_test")
         end
       end
 
@@ -369,7 +488,7 @@ describe JenkinsApi::Client::Job do
           response = @client.job.build(@job_name)
           # As of Jenkins version 1.519 the job build responds with a 201
           # status code.
-          [201, 302].should include(response.to_i)
+          @valid_post_responses.should include(response.to_i)
           # Sleep for 6 seconds so we don't hit the Jenkins quiet period (5
           # seconds)
           sleep 6
@@ -381,6 +500,20 @@ describe JenkinsApi::Client::Job do
         end
       end
 
+      describe "#disable" do
+        it "Should disable the specified job and then enable it again" do
+          @client.job.list_details(@job_name)['buildable'].should == true
+          response = @client.job.disable(@job_name)
+          response.to_i.should == 302
+          sleep 3
+          @client.job.list_details(@job_name)['buildable'].should == false
+          response = @client.job.enable(@job_name)
+          response.to_i.should == 302
+          sleep 3
+          @client.job.list_details(@job_name)['buildable'].should == true
+        end
+      end
+
       describe "#stop" do
         it "Should be able to abort a recent build of a running job" do
           @client.job.get_current_build_status(
@@ -390,7 +523,9 @@ describe JenkinsApi::Client::Job do
           sleep 6
           @client.job.get_current_build_status(@job_name).should == "running"
           sleep 5
-          @client.job.stop_build(@job_name).to_i.should == 302
+          @valid_post_responses.should include(
+            @client.job.stop_build(@job_name).to_i
+          )
           sleep 5
           @client.job.get_current_build_status(@job_name).should == "aborted"
         end
@@ -398,9 +533,13 @@ describe JenkinsApi::Client::Job do
 
       describe "#restrict_to_node" do
         it "Should be able to restrict a job to a node" do
-          @client.job.restrict_to_node(@job_name, 'master').to_i.should == 200
+          @valid_post_responses.should include(
+            @client.job.restrict_to_node(@job_name, 'master').to_i
+          )
           # Run it again to make sure that the replace existing node works
-          @client.job.restrict_to_node(@job_name, 'master').to_i.should == 200
+          @valid_post_responses.should include(
+            @client.job.restrict_to_node(@job_name, 'master').to_i
+          )
         end
       end