subordinate 0.6.1 → 0.6.2

data/spec/subordinate/client/queue_spec.rb

@@ -1,19 +1,22 @@
+# Queue Spec
 require "spec_helper"
 
-# Queue Spec
 describe Subordinate::Client do
   before do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
-  let(:subordinate) { Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]) }
 
-  describe "#build_queue", :vcr do
+  let(:subordinate) { Subordinate::Client.new(:username => "someusername", :api_token => "sometoken") }
+
+  describe "#build_queue" do
+    before(:each) { stub_jenkins(:get, "/queue/api/json", "queue.json") }
+
     let(:current_response) { subordinate.build_queue }
 
     it "returns the build queue response" do
@@ -26,4 +29,4 @@ describe Subordinate::Client do
       end
     end
   end
-end
+end

data/spec/subordinate/client/system_spec.rb

@@ -1,19 +1,22 @@
+# System Spec
 require "spec_helper"
 
-# Client Spec
 describe Subordinate::Client do
   before do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
-  let(:subordinate) { Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]) }
 
-  describe "#root", :vcr do
+  let(:subordinate) { Subordinate::Client.new(:username => "someusername", :api_token => "sometoken") }
+
+  describe "#root" do
+    before(:each) { stub_jenkins(:get, "/api/json", "base.json") }
+
     let(:current_response) { subordinate.root }
 
     it "returns the root response", :vcr do
@@ -120,4 +123,4 @@ describe Subordinate::Client do
       subordinate.safe_restart.should == 302
     end
   end
-end
+end

data/spec/subordinate/client/view_spec.rb

@@ -1,21 +1,23 @@
+# View Spec
 require "spec_helper"
 
-# View Spec
 describe Subordinate::Client do
   before do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
 
-  let(:subordinate) { Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]) }
+  let(:subordinate) { Subordinate::Client.new(:username => "someusername", :api_token => "sometoken") }
 
-  describe "#view", :vcr do
-    let(:current_response) { subordinate.view(ENV["VIEW"]) }
+  describe "#view" do
+    before(:each) { stub_jenkins(:get, "/view/someview/api/json", "view.json") }
+    
+    let(:current_response) { subordinate.view("someview") }
 
     it "returns the view response" do
       current_response.should_not be_nil
@@ -44,7 +46,9 @@ describe Subordinate::Client do
     end
   end
 
-  describe "#all_views", :vcr do
+  describe "#all_views" do
+    before(:each) { stub_jenkins(:get, "/api/json?tree=views%5Bname,url,jobs%5Bname,url%5D%5D", "views.json") }
+
     let(:current_response) { subordinate.all_views }
 
     it "returns the view response" do
@@ -74,19 +78,45 @@ describe Subordinate::Client do
 
   describe "#add_job_to_view" do
     it "responds with a success" do
-      stub_request(:post, "#{subordinate.api_endpoint}/view/#{ENV["VIEW"]}/addJobToView?name=#{ENV['JOB']}").
-      to_return(:status => 200, :body => "", :headers => {})
+      stub_jenkins(:post, "/view/someview/addJobToView?name=somejob", 200, "empty.json")
+
+      subordinate.add_job_to_view("someview", "somejob").status.should == 200
+    end
+
+    context "error" do
+      it "returns 404 when not found" do
+        stub_jenkins(:post, "/view/someview/addJobToView?name=somejob", 404, "empty.json")
+
+        subordinate.add_job_to_view("someview", "somejob").status.should == 404
+      end
+      
+      it "returns 500 when server error" do
+        stub_jenkins(:post, "/view/someview/addJobToView?name=somejob", 500, "empty.json")
 
-      subordinate.add_job_to_view(ENV["VIEW"], ENV["JOB"]).status.should == 200
+        subordinate.add_job_to_view("someview", "somejob").status.should == 500
+      end
     end
   end
 
   describe "#remove_job_from_view" do
     it "responds with a success" do
-      stub_request(:post, "#{subordinate.api_endpoint}/view/#{ENV["VIEW"]}/removeJobFromView?name=#{ENV['JOB']}").
-      to_return(:status => 200, :body => "", :headers => {})
+      stub_jenkins(:post, "/view/someview/removeJobFromView?name=somejob", 200, "empty.json")
+
+      subordinate.remove_job_from_view("someview", "somejob").status.should == 200
+    end
+    
+    context "error" do
+      it "returns 404 when not found" do
+        stub_jenkins(:post, "/view/someview/removeJobFromView?name=somejob", 404, "empty.json")
 
-      subordinate.remove_job_from_view(ENV["VIEW"], ENV["JOB"]).status.should == 200
+        subordinate.remove_job_from_view("someview", "somejob").status.should == 404
+      end
+      
+      it "returns 500 when server error" do
+        stub_jenkins(:post, "/view/someview/removeJobFromView?name=somejob", 500, "empty.json")
+
+        subordinate.remove_job_from_view("someview", "somejob").status.should == 500
+      end
     end
   end
-end
+end

data/spec/subordinate/client_spec.rb

@@ -5,9 +5,9 @@ describe Subordinate::Client do
   before do
     Subordinate.reset!
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
@@ -17,6 +17,8 @@ describe Subordinate::Client do
     let(:subdomain) { "awesome" }
     let(:port)      { 2000 }
     let(:ssl)       { false }
+    let(:username)  { "someusername" }
+    let(:token)     { "sometoken" }
 
     it "can be initialized" do
       Subordinate::Client.new.class.should == Subordinate::Client
@@ -26,34 +28,35 @@ describe Subordinate::Client do
       Subordinate.new.class.should == Subordinate::Client
     end
 
-    it "works with basic username and api token", :vcr do
-      Subordinate::Client.new(:username => ENV["USERNAME"], :api_token => ENV["TOKEN"]).root
+    it "works with basic username and api token" do
+      stub_jenkins(:get, "/api/json", "base.json")
+      Subordinate::Client.new(:username => username, :api_token => token).root
       .should_not
       raise_exception
     end
 
     it "generates an endpoint without username and api token" do
-      client = Subordinate::Client.new(:api_key => ENV["API_KEY"] )
-      client.api_endpoint.should_not include("#{ENV["USERNAME"]}:#{ENV["API_KEY"]}")
+      client = Subordinate::Client.new(:api_token => token )
+      client.api_endpoint.should_not include("#{username}:#{token}")
     end
 
     it "can be configured to use a new domain via options" do
-      client = Subordinate::Client.new(:api_key => ENV["API_KEY"], :domain => domain )
+      client = Subordinate::Client.new(:api_token => token, :domain => domain )
       client.domain.should == domain
     end
 
     it "can be configured to use a new subdomain via options" do
-      client = Subordinate::Client.new(:api_key => ENV["API_KEY"], :subdomain => subdomain )
+      client = Subordinate::Client.new(:api_token => token, :subdomain => subdomain )
       client.subdomain.should == subdomain
     end
 
     it "can be configured to use a new port via options" do
-      client = Subordinate::Client.new(:api_key => ENV["API_KEY"], :port => port )
+      client = Subordinate::Client.new(:api_token => token, :port => port )
       client.port.should == port
     end
 
     it "can be configured to use a different ssl option via options" do
-      client = Subordinate::Client.new(:api_key => ENV["API_KEY"], :ssl => ssl )
+      client = Subordinate::Client.new(:api_token => token, :ssl => ssl )
       client.ssl.should == ssl
     end
   end

data/spec/subordinate/configuration_spec.rb

@@ -1,13 +1,14 @@
+# Configuration Spec
 require "spec_helper"
 
-# Configuration Spec
 describe Subordinate::Client do
   before do
     Subordinate.reset!
+
     Subordinate.configure do |c|
-      c.subdomain = ENV["SUBDOMAIN"]
-      c.domain    = ENV["DOMAIN"]
-      c.port      = ENV["PORT"]
+      c.subdomain = "jenkins"
+      c.domain    = "example.com"
+      c.port      = 8080
       c.ssl       = false
     end
   end
@@ -60,7 +61,7 @@ describe Subordinate::Client do
     describe "without a subdomain" do
       it "builds an endpoint without a subdomain" do
         client = Subordinate.new(:subdomain => nil)
-        client.api_endpoint.should == "http://#{ENV["DOMAIN"]}:#{ENV["PORT"]}"
+        client.api_endpoint.should == "http://example.com:8080"
       end
     end
 
@@ -87,7 +88,7 @@ describe Subordinate::Client do
     describe "without a port" do
       it "builds an endpoint without a port" do
         client = Subordinate.new(:port => nil)
-        client.api_endpoint.should == "http://#{ENV["SUBDOMAIN"]}.#{ENV["DOMAIN"]}"
+        client.api_endpoint.should == "http://jenkins.example.com"
       end
     end
 
@@ -116,4 +117,4 @@ describe Subordinate::Client do
       end
     end
   end
-end
+end

data/spec/support/mocks/base.json

@@ -0,0 +1,49 @@
+{
+  "assignedLabels" : [
+    {
+      
+    }
+  ],
+  "mode" : "NORMAL",
+  "nodeDescription" : "the master Jenkins node",
+  "nodeName" : "",
+  "numExecutors" : 2,
+  "description" : null,
+  "jobs" : [
+    {
+      "name" : "Mission-Control-Production",
+      "url" : "http://jenkins.missioncontrol.io:8080/job/Mission-Control-Production/",
+      "color" : "red"
+    },
+    {
+      "name" : "Mission-Control-Staging",
+      "url" : "http://jenkins.missioncontrol.io:8080/job/Mission-Control-Staging/",
+      "color" : "blue"
+    },
+    {
+      "name" : "Mission-Control-Staging-Testing",
+      "url" : "http://jenkins.missioncontrol.io:8080/job/Mission-Control-Staging-Testing/",
+      "color" : "red"
+    }
+  ],
+  "overallLoad" : {
+    
+  },
+  "primaryView" : {
+    "name" : "All",
+    "url" : "http://jenkins.missioncontrol.io:8080/"
+  },
+  "quietingDown" : false,
+  "slaveAgentPort" : 0,
+  "unlabeledLoad" : {
+    
+  },
+  "useCrumbs" : false,
+  "useSecurity" : true,
+  "views" : [
+    {
+      "name" : "All",
+      "url" : "http://jenkins.missioncontrol.io:8080/"
+    }
+  ]
+}

data/spec/support/mocks/build.json

@@ -0,0 +1,126 @@
+{
+  "actions" : [
+    {
+      "causes" : [
+        {
+          "shortDescription" : "Started by an SCM change"
+        }
+      ]
+    },
+    {
+      
+    },
+    {
+      "buildsByBranchName" : {
+        "origin/rc" : {
+          "buildNumber" : 363,
+          "buildResult" : null,
+          "marked" : {
+            "SHA1" : "28d38cb39d048c0ceaeff34d033e90a7886aa251",
+            "branch" : [
+              {
+                "SHA1" : "28d38cb39d048c0ceaeff34d033e90a7886aa251",
+                "name" : "origin/rc"
+              }
+            ]
+          },
+          "revision" : {
+            "SHA1" : "28d38cb39d048c0ceaeff34d033e90a7886aa251",
+            "branch" : [
+              {
+                "SHA1" : "28d38cb39d048c0ceaeff34d033e90a7886aa251",
+                "name" : "origin/rc"
+              }
+            ]
+          }
+        }
+      },
+      "lastBuiltRevision" : {
+        "SHA1" : "28d38cb39d048c0ceaeff34d033e90a7886aa251",
+        "branch" : [
+          {
+            "SHA1" : "28d38cb39d048c0ceaeff34d033e90a7886aa251",
+            "name" : "origin/rc"
+          }
+        ]
+      },
+      "remoteUrls" : [
+        "git://github.com/jenkinsci/jenkins"
+      ],
+      "scmName" : ""
+    },
+    {
+      
+    },
+    {
+      
+    },
+    {
+      
+    },
+    {
+      "failCount" : 1,
+      "skipCount" : 5,
+      "totalCount" : 4513,
+      "urlName" : "testReport"
+    },
+    {
+      
+    }
+  ],
+  "artifacts" : [
+    {
+      "displayPath" : "cli-1.531-SNAPSHOT-jar-with-dependencies.jar",
+      "fileName" : "cli-1.531-SNAPSHOT-jar-with-dependencies.jar",
+      "relativePath" : "cli/target/cli-1.531-SNAPSHOT-jar-with-dependencies.jar"
+    }
+  ],
+  "building" : false,
+  "description" : null,
+  "duration" : 3083928,
+  "estimatedDuration" : 4359595,
+  "executor" : null,
+  "fullDisplayName" : "jenkins_rc_branch #363",
+  "id" : "2013-09-09_21-32-40",
+  "keepLog" : false,
+  "number" : 363,
+  "result" : "UNSTABLE",
+  "timestamp" : 1378776760497,
+  "url" : "http://ci.jenkins-ci.org/view/Jenkins%20core/job/jenkins_rc_branch/363/",
+  "builtOn" : "remote-slave-6",
+  "changeSet" : {
+    "items" : [
+      {
+        "affectedPaths" : [
+          "core/src/main/resources/lib/form/textbox.jelly",
+          "core/src/main/resources/lib/form/expandableTextbox.jelly",
+          "core/src/main/resources/lib/form/advanced.jelly",
+          "core/src/main/resources/lib/form/textarea.jelly"
+        ],
+        "commitId" : "7ce4807087239bbe236cb34e9a8d183caffefe73",
+        "timestamp" : 1367431809000,
+        "author" : {
+          "absoluteUrl" : "http://ci.jenkins-ci.org/user/Jesse%20Glick",
+          "fullName" : "Jesse Glick"
+        },
+        "comment" : "[JENKINS-3107] Expand an Advanced section if some fields are already customized.\nInitial implementation handles only text fields, not e.g. checkboxes.\n",
+        "date" : "2013-05-01 14:10:09 -0400",
+        "id" : "7ce4807087239bbe236cb34e9a8d183caffefe73",
+        "msg" : "[JENKINS-3107] Expand an Advanced section if some fields are already customized.",
+        "paths" : [
+          {
+            "editType" : "edit",
+            "file" : "core/src/main/resources/lib/form/textarea.jelly"
+          }
+        ]
+      }
+    ],
+    "kind" : "git"
+  },
+  "culprits" : [
+    {
+      "absoluteUrl" : "http://ci.jenkins-ci.org/user/Jesse%20Glick",
+      "fullName" : "Jesse Glick"
+    }
+  ]
+}