jenkins_api_client 1.0.0.alpha.2 → 1.0.0.beta.1

data/spec/unit_tests/fake_http_response.rb

@@ -0,0 +1,9 @@
+class FakeResponse
+  attr_accessor :code, :body, :header
+
+  def initialize(code=200, body='eww, a body', header={})
+    @body = body
+    @code = code
+    @header = header
+  end
+end

data/spec/unit_tests/job_spec.rb

@@ -1,13 +1,14 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'net/http'
+require File.expand_path('../fake_http_response', __FILE__)
 
 describe JenkinsApi::Client::Job do
   context "With properly initialized Client and all methods defined" do
 
     before do
       mock_logger = Logger.new "/dev/null"
-      @client = double
-      @client.should_receive(:logger).and_return(mock_logger)
+      @client = JenkinsApi::Client.new({:server_ip => '127.0.0.1'})
+      @client.should_receive(:logger).at_least(1).and_return(mock_logger)
       @job = JenkinsApi::Client::Job.new(@client)
       @sample_json_response = {
         "jobs" => [
@@ -248,7 +249,7 @@ describe JenkinsApi::Client::Job do
           msg = "/job/test_job/1/logText/progressiveText?start=0"
           @client.should_receive(:api_get_request).
                   with(msg, nil, nil, true).
-                  and_return(Net::HTTP.get_response(URI('http://example.com/index.html')))
+                  and_return(FakeResponse.new)
           @job.get_console_output('test_job', 1, 0, 'text')
         end
 
@@ -380,19 +381,102 @@ describe JenkinsApi::Client::Job do
       end
 
       describe "#build" do
+        # First tests confirm the build method works the same as it used to
         it "accepts the job name and builds the job" do
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job").and_return({})
           @client.should_receive(:api_post_request).with(
-            "/job/test_job/build", {}, false).and_return(302)
+            "/job/test_job/build", {}, true).and_return(FakeResponse.new(302))
           @job.build("test_job").should == 302
         end
         it "accepts the job name with params and builds the job" do
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job").and_return({})
           @client.should_receive(:api_post_request).with(
             "/job/test_job/buildWithParameters",
             {:branch => 'feature/new-stuff'},
-            false
-          ).and_return(302)
+            true
+          ).and_return(FakeResponse.new(302))
           @job.build("test_job", {:branch => 'feature/new-stuff'}).should == 302
         end
+
+        ### OLD NON-QUEUE RESPONSE JENKINS ###
+        # Next tests confirm it deals with different jenkins versions and waits
+        # for build to start (or not)
+        it "accepts the job name and builds the job (w/timeout)" do
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job").and_return({})
+          @client.should_receive(:api_post_request).with(
+            "/job/test_job/build", {}, true).and_return(FakeResponse.new(302))
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job/1/").and_return({})
+          @client.should_receive(:get_jenkins_version).and_return("1.1")
+          @job.build("test_job", {}, {'build_start_timeout' => 10}).should == 1
+        end
+
+        # wait for build to start (or not) (initial response will fail)
+        it "accepts the job name and builds the job after short delay (w/timeout)" do
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job").and_return({})
+          @client.should_receive(:api_post_request).with(
+            "/job/test_job/build", {}, true).and_return(FakeResponse.new(302))
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job/1/").ordered.and_raise(JenkinsApi::Exceptions::NotFound.new(@client.logger))
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job/1/").ordered.and_return({})
+          @client.should_receive(:get_jenkins_version).and_return("1.1")
+          @job.build("test_job", {}, {'build_start_timeout' => 3}).should == 1
+        end
+
+        # wait for build to start - will fail
+        it "accepts the job name and builds the job, but the job doesn't start" do
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job").and_return({})
+          @client.should_receive(:api_post_request).with(
+            "/job/test_job/build", {}, true).and_return(FakeResponse.new(302))
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job/1/").twice.ordered.and_raise(JenkinsApi::Exceptions::NotFound.new(@client.logger))
+          @client.should_receive(:get_jenkins_version).and_return("1.1")
+          expect( lambda { @job.build("test_job", {}, {'build_start_timeout' => 3}) }).to raise_error(Timeout::Error)
+        end
+
+        ### JENKINS POST 1.519 (QUEUE RESPONSE) ###
+        # Next tests confirm it deals with different jenkins versions and waits
+        # for build to start (or not)
+        it "accepts the job name and builds the job (w/timeout)" do
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job").and_return({})
+          @client.should_receive(:api_post_request).with(
+            "/job/test_job/build", {}, true).and_return({"location" => "/item/42/"})
+          @client.should_receive(:api_get_request).with(
+            "/queue/item/42").and_return({'executable' => {'number' => 1}})
+          @client.should_receive(:get_jenkins_version).and_return("1.519")
+          @job.build("test_job", {}, {'build_start_timeout' => 10}).should == 1
+        end
+
+        # wait for build to start (or not) (initial response will fail)
+        it "accepts the job name and builds the job after short delay (w/timeout)" do
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job").and_return({})
+          @client.should_receive(:api_post_request).with(
+            "/job/test_job/build", {}, true).and_return({"location" => "/item/42/"})
+          @client.should_receive(:api_get_request).with(
+            "/queue/item/42").and_return({}, {'executable' => {'number' => 1}})
+          @client.should_receive(:get_jenkins_version).and_return("1.519")
+          @job.build("test_job", {}, {'build_start_timeout' => 3}).should == 1
+        end
+
+        # wait for build to start - will fail
+        it "accepts the job name and builds the job, but the job doesn't start" do
+          @client.should_receive(:api_get_request).with(
+            "/job/test_job").and_return({})
+          @client.should_receive(:api_post_request).with(
+            "/job/test_job/build", {}, true).and_return({"location" => "/item/42/"})
+          @client.should_receive(:api_get_request).with(
+            "/queue/item/42").and_return({}, {})
+          @client.should_receive(:get_jenkins_version).and_return("1.519")
+          expect( lambda { @job.build("test_job", {}, {'build_start_timeout' => 3}) }).to raise_error(Timeout::Error)
+        end
       end
 
       describe "#poll" do
@@ -515,6 +599,25 @@ describe JenkinsApi::Client::Job do
         end
       end
 
+      describe "#get_promotions" do
+        it "accepts the jon name and returns the promotions" do
+            mock_job_promotions_response = {
+              "processes" => [ { "name"  => "dev",
+                                 "url"   => "not_required",
+                                 "color" => "blue",
+                               },
+                               { "name"  => "stage",
+                                 "url"   => "not_required",
+                                 "color" => "notbuilt",
+                               },
+                             ], }
+
+          @client.should_receive(:api_get_request).with('/job/test_job/promotion').and_return(
+            mock_job_promotions_response)
+          @client.should_receive(:api_get_request).and_return({'target' => {'number' => 42}})
+          @job.get_promotions("test_job").should == {'dev' => 42, 'stage' => nil}
+        end
+      end
     end
   end
 end

data/spec/unit_tests/system_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('../fake_http_response', __FILE__)
 
 describe JenkinsApi::Client::System do
   context "With properly initialized Client" do
@@ -65,7 +66,7 @@ describe JenkinsApi::Client::System do
 
       describe "#wait_for_ready" do
         it "exits if the response body doesn't have the wait message" do
-          @client.should_receive(:get_root).and_return(Net::HTTP.get_response(URI('http://example.com/index.html')))
+          @client.should_receive(:get_root).and_return(FakeResponse.new)
           @system.wait_for_ready
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_api_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.2
+  version: 1.0.0.beta.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -227,13 +227,14 @@ files:
 - lib/jenkins_api_client/node.rb
 - lib/jenkins_api_client/plugin_manager.rb
 - lib/jenkins_api_client/system.rb
+- lib/jenkins_api_client/urihelper.rb
 - lib/jenkins_api_client/user.rb
 - lib/jenkins_api_client/version.rb
 - lib/jenkins_api_client/view.rb
 - scripts/login_with_irb.rb
 - spec/func_tests/client_spec.rb
 - spec/func_tests/job_spec.rb
-- spec/func_tests/node_spec.rb
+- spec/func_tests/node_spec.rb.pending
 - spec/func_tests/plugin_spec.rb
 - spec/func_tests/spec_helper.rb
 - spec/func_tests/system_spec.rb
@@ -241,6 +242,7 @@ files:
 - spec/func_tests/view_spec.rb
 - spec/unit_tests/build_queue_spec.rb
 - spec/unit_tests/client_spec.rb
+- spec/unit_tests/fake_http_response.rb
 - spec/unit_tests/fixtures/files/available_plugins.json
 - spec/unit_tests/fixtures/files/computer_sample.xml
 - spec/unit_tests/fixtures/files/installed_plugins.json