Merge pull request #1 from luchenghan/is_offline_bug

Restoring node property methods to its original logic, but handles both bool and string case
arangamani · Mar 31, 2015 · e0f99c2 · e0f99c2
2 parents 1aed610 + c233856
commit e0f99c2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/lib/jenkins_api_client/node.rb b/lib/jenkins_api_client/node.rb
@@ -255,7 +255,8 @@ def index(node_name)
         define_method("is_#{meth_suffix}?") do |node_name|
           @logger.info "Obtaining '#{meth_suffix}' property of '#{node_name}'"
           response_json = @client.api_get_request("/computer")
-          response_json["computer"][index(node_name)]["#{meth_suffix}"]
+          resp = response_json["computer"][index(node_name)]["#{meth_suffix}"].to_s
+          resp =~ /False/i ? false : true
         end
       end
 

diff --git a/spec/unit_tests/node_spec.rb b/spec/unit_tests/node_spec.rb
@@ -24,6 +24,18 @@
           "offline"     => false,
         ]
       }
+      @offline_slave_in_string        = {
+        "computer" => [
+          "displayName" => "slave",
+          "offline"     => "true",
+        ]
+      }
+      @online_slave_in_string        = {
+        "computer" => [
+          "displayName" => "slave",
+          "offline"     => "false",
+        ]
+      }
       computer_sample_xml_filename = '../fixtures/files/computer_sample.xml'
       @sample_computer_xml = File.read(
         File.expand_path(computer_sample_xml_filename , __FILE__)
@@ -190,6 +202,24 @@
           )
           @node.method("is_offline?").call("slave").should be_false
         end
+
+        it "returns false if the node is online and have a string value on its attr" do
+          @client.should_receive(
+            :api_get_request
+          ).twice.and_return(
+            @offline_slave_in_string
+          )
+          @node.method("is_offline?").call("slave").should be_true
+        end
+
+        it "returns false if the node is online and have a string value on its attr" do
+          @client.should_receive(
+            :api_get_request
+          ).twice.and_return(
+            @online_slave_in_string
+          )
+          @node.method("is_offline?").call("slave").should be_false
+        end
       end
 
       describe "NodeAttributes" do