octokit 0.6.5 → 1.0.0

data/spec/helper.rb

@@ -1,7 +1,7 @@
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_filter "/spec"
+end
 require 'octokit'
 require 'rspec'
 require 'webmock/rspec'

data/spec/octokit/client/commits_spec.rb

@@ -29,4 +29,37 @@ describe Octokit::Client::Commits do
 
   end
 
+  describe ".list_commit_comments" do
+
+    it "should return a list of all commit comments" do
+      stub_get("/repos/sferik/rails_admin/comments").
+        to_return(:body => fixture("v3/list_commit_comments.json"))
+      commit_comments = @client.list_commit_comments("sferik/rails_admin")
+      commit_comments.first.user.login.should == "sferik"
+    end
+
+  end
+
+  describe ".commit_comments" do
+
+    it "should return a list of comments for a specific commit" do
+      stub_get("/repos/sferik/rails_admin/commits/629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3/comments").
+        to_return(:body => fixture("v3/commit_comments.json"))
+      commit_comments = @client.commit_comments("sferik/rails_admin", "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3")
+      commit_comments.first.user.login.should == "bbenezech"
+    end
+
+  end
+
+  describe ".commit_comment" do
+
+    it "should return a single commit comment" do
+      stub_get("/repos/sferik/rails_admin/comments/861907").
+        to_return(:body => fixture("v3/commit_comment.json"))
+      commit = @client.commit_comment("sferik/rails_admin", "861907")
+      commit.user.login.should == "bbenezech"
+    end
+
+  end
+
 end

data/spec/octokit/client/events_spec.rb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+require 'helper'
+
+describe Octokit::Client::Events do
+  before do
+    @client = Octokit::Client.new(:login => 'sferik')
+  end
+
+  describe ".public_events" do
+    it "should return all public events" do
+      stub_get("/events").
+        to_return(:body => fixture("v3/public_events.json"))
+      public_events = @client.public_events
+      public_events.first.id.should == '1513284759'
+    end
+  end
+
+  describe ".repository_events" do
+    it "should return events for a repository" do
+      stub_get("/repos/sferik/rails_admin/events").
+        to_return(:body => fixture("v3/repo_events.json"))
+      repo_events = @client.repository_events("sferik/rails_admin")
+      repo_events.first.type.should == "IssuesEvent"
+    end
+    
+  end
+end

data/spec/octokit/client/issue_events_spec.rb

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+require 'helper'
+
+describe Octokit::Client::Issues do
+
+  before do
+    @client = Octokit::Client.new(:login => 'sferik')
+  end
+
+  describe ".issue_events" do
+
+    it "should list events for an issue" do
+      stub_get("/repos/pengwynn/octokit/issues/38/events").
+      to_return(:body => fixture("v3/issue_events.json"))
+      events = @client.issue_events("pengwynn/octokit", 38)
+      events.first.event.should == "mentioned"
+      events.last.actor.login.should == "ctshryock"
+    end
+
+    it "should get a single event" do
+      stub_get("/repos/pengwynn/octokit/issues/events/3094334").
+      to_return(:body => fixture("v3/issue_event.json"))
+      events = @client.issue_event("pengwynn/octokit", 3094334)
+      events.actor.login.should == "sferik"
+      events.event.should == "closed"
+    end
+
+  end
+
+end

data/spec/octokit/client/issues_spec.rb

@@ -32,10 +32,12 @@ describe Octokit::Client::Issues do
   describe ".create_issue" do
 
     it "should create an issue" do
-      stub_post("https://github.com/api/v2/json/issues/open/sferik/rails_admin").
-        to_return(:body => fixture("v2/issue.json"))
-      issue = @client.create_issue("sferik/rails_admin", "Use OrmAdapter instead of talking directly to ActiveRecord", "Hi,\n\nI just tried to play with this in an app with no ActiveRecord.  I was disappointed.  It seems the only reason the engine relies on AR is to provide History functionality.  I would argue that having the History in a database, and therefore tying the app to AR & SQL, isn't worth it.  How about we change it to just dump to a CSV and remove the AR dep?\n\n$0.02")
-      issue.number.should == 105
+      stub_post("/repos/ctshryock/octokit/issues").
+        with(:body => {"title" => "Migrate issues to v3", "body" => "Move all Issues calls to v3 of the API"},
+             :headers => {'Content-Type'=>'application/json'}).
+        to_return(:body => fixture("v3/issue.json"))
+      issue = @client.create_issue("ctshryock/octokit", "Migrate issues to v3", "Move all Issues calls to v3 of the API")
+      issue.number.should == 12 
     end
 
   end
@@ -43,10 +45,10 @@ describe Octokit::Client::Issues do
   describe ".issue" do
 
     it "should return an issue" do
-      stub_get("https://github.com/api/v2/json/issues/show/sferik/rails_admin/105").
-        to_return(:body => fixture("v2/issue.json"))
-      issue = @client.issue("sferik/rails_admin", 105)
-      issue.number.should == 105
+      stub_get("/repos/ctshryock/octokit/issues/12").
+        to_return(:body => fixture("v3/issue.json"))
+      issue = @client.issue("ctshryock/octokit", 12)
+      issue.number.should == 12
     end
 
   end
@@ -54,10 +56,14 @@ describe Octokit::Client::Issues do
   describe ".close_issue" do
 
     it "should close an issue" do
-      stub_post("https://github.com/api/v2/json/issues/close/sferik/rails_admin/105").
-        to_return(:body => fixture("v2/issue.json"))
-      issue = @client.close_issue("sferik/rails_admin", 105)
-      issue.number.should == 105
+      stub_post("/repos/ctshryock/octokit/issues/12").
+        with(:body => {"state" => "closed"},
+             :headers => {'Content-Type'=>'application/json'}).
+        to_return(:body => fixture("v3/issue_closed.json"))
+      issue = @client.close_issue("ctshryock/octokit", 12)
+      issue.number.should == 12
+      issue.should include :closed_at
+      issue.state.should == "closed"
     end
 
   end
@@ -65,10 +71,13 @@ describe Octokit::Client::Issues do
   describe ".reopen_issue" do
 
     it "should reopen an issue" do
-      stub_post("https://github.com/api/v2/json/issues/reopen/sferik/rails_admin/105").
-        to_return(:body => fixture("v2/issue.json"))
-      issue = @client.reopen_issue("sferik/rails_admin", 105)
-      issue.number.should == 105
+      stub_post("/repos/ctshryock/octokit/issues/12").
+        with(:body => {"state" => "open"},
+             :headers => {'Content-Type'=>'application/json'}).
+        to_return(:body => fixture("v3/issue.json"))
+      issue = @client.reopen_issue("ctshryock/octokit", 12)
+      issue.number.should == 12
+      issue.state.should == "open"
     end
 
   end
@@ -76,10 +85,12 @@ describe Octokit::Client::Issues do
   describe ".update_issue" do
 
     it "should update an issue" do
-      stub_post("https://github.com/api/v2/json/issues/edit/sferik/rails_admin/105").
-        to_return(:body => fixture("v2/issue.json"))
-      issue = @client.update_issue("sferik/rails_admin", 105, "Use OrmAdapter instead of talking directly to ActiveRecord", "Hi,\n\nI just tried to play with this in an app with no ActiveRecord.  I was disappointed.  It seems the only reason the engine relies on AR is to provide History functionality.  I would argue that having the History in a database, and therefore tying the app to AR & SQL, isn't worth it.  How about we change it to just dump to a CSV and remove the AR dep?\n\n$0.02")
-      issue.number.should == 105
+      stub_post("/repos/ctshryock/octokit/issues/12").
+        with(:body => {"title" => "Use all the v3 api!", "body" => ""},
+             :headers => {'Content-Type'=>'application/json'}).
+        to_return(:body => fixture("v3/issue.json"))
+      issue = @client.update_issue("ctshryock/octokit", 12, "Use all the v3 api!", "")
+      issue.number.should == 12
     end
 
   end

data/spec/octokit/client/labels_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'helper'
 
-describe Octokit::Client::Issues do
+describe Octokit::Client::Labels do
 
   before do
     @client = Octokit::Client.new(:login => 'sferik')

data/spec/octokit/client/objects_spec.rb

@@ -10,10 +10,11 @@ describe Octokit::Client::Objects do
   describe ".tree" do
 
     it "should return a tree" do
-      stub_get("https://github.com/api/v2/json/tree/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("v2/tree.json"))
-      tree = @client.tree("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
-      tree.first.name.should == ".gitignore"
+      stub_get("https://api.github.com/repos/sferik/rails_admin/git/trees/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
+        to_return(:body => fixture("v3/tree.json"))
+      result = @client.tree("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
+      result.sha.should == "3cdfabd973bc3caac209cba903cfdb3bf6636bcd"
+      result.tree.first.path.should == ".gitignore"
     end
 
   end
@@ -21,10 +22,10 @@ describe Octokit::Client::Objects do
   describe ".blob" do
 
     it "should return a blob" do
-      stub_get("https://github.com/api/v2/json/blob/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd/README.mkd").
-        to_return(:body => fixture("v2/blob.json"))
-      blob = @client.blob("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd", "README.mkd")
-      blob.name.should == "README.mkd"
+      stub_get("https://api.github.com/repos/sferik/rails_admin/git/blobs/94616fa57520ac8147522c7cf9f03d555595c5ea").
+        to_return(:body => fixture("v3/blob.json"))
+      blob = @client.blob("sferik/rails_admin", "94616fa57520ac8147522c7cf9f03d555595c5ea")
+      blob.sha.should == "94616fa57520ac8147522c7cf9f03d555595c5ea"
     end
 
   end

data/spec/octokit/client/organizations_spec.rb

@@ -10,8 +10,8 @@ describe Octokit::Client::Organizations do
   describe ".organization" do
 
     it "should return an organization" do
-      stub_get("https://github.com/api/v2/json/organizations/codeforamerica").
-        to_return(:body => fixture("v2/organization.json"))
+      stub_get("https://api.github.com/orgs/codeforamerica").
+        to_return(:body => fixture("v3/organization.json"))
       organization = @client.organization("codeforamerica")
       organization.name.should == "Code For America"
     end
@@ -21,9 +21,9 @@ describe Octokit::Client::Organizations do
   describe ".update_organization" do
 
     it "should update an organization" do
-      stub_put("https://github.com/api/v2/json/organizations/codeforamerica").
+      stub_patch("https://api.github.com/orgs/codeforamerica").
         with(:name => "Code For America").
-        to_return(:body => fixture("v2/organization.json"))
+        to_return(:body => fixture("v3/organization.json"))
       organization = @client.update_organization("codeforamerica", {:name => "Code For America"})
       organization.name.should == "Code For America"
     end
@@ -32,24 +32,24 @@ describe Octokit::Client::Organizations do
 
   describe ".organizations" do
 
-    context "with an org passed" do
+    context "with a user passed" do
 
       it "should return all organizations for a user" do
-        stub_get("https://github.com/api/v2/json/user/show/sferik/organizations").
-          to_return(:body => fixture("v2/organizations.json"))
+        stub_get("https://api.github.com/users/sferik/orgs").
+          to_return(:body => fixture("v3/organizations.json"))
         organizations = @client.organizations("sferik")
-        organizations.first.name.should == "Hubcap"
+        organizations.first.login.should == "Hubcap"
       end
 
     end
 
-    context "without an org passed" do
+    context "without user passed" do
 
       it "should return all organizations for a user" do
-        stub_get("https://github.com/api/v2/json/organizations").
-          to_return(:body => fixture("v2/organizations.json"))
+        stub_get("https://api.github.com/user/orgs").
+          to_return(:body => fixture("v3/organizations.json"))
         organizations = @client.organizations
-        organizations.first.name.should == "Hubcap"
+        organizations.first.login.should == "Hubcap"
       end
 
     end
@@ -61,10 +61,10 @@ describe Octokit::Client::Organizations do
     context "with an org passed" do
 
       it "should return all public repositories for an organization" do
-        stub_get("https://github.com/api/v2/json/organizations/codeforamerica/public_repositories").
-          to_return(:body => fixture("v2/repositories.json"))
+        stub_get("https://api.github.com/orgs/codeforamerica/repos").
+          to_return(:body => fixture("v3/organization-repositories.json"))
         repositories = @client.organization_repositories("codeforamerica")
-        repositories.first.name.should == "One40Proof"
+        repositories.first.name.should == "cfahelloworld"
       end
 
     end
@@ -75,7 +75,7 @@ describe Octokit::Client::Organizations do
         stub_get("https://github.com/api/v2/json/organizations/repositories").
           to_return(:body => fixture("v2/repositories.json"))
         repositories = @client.organization_repositories
-        repositories.first.name.should == "One40Proof"
+        repositories.repositories.first.name.should == "One40Proof"
       end
 
     end
@@ -85,10 +85,10 @@ describe Octokit::Client::Organizations do
   describe ".organization_members" do
 
     it "should return all public members of an organization" do
-      stub_get("https://github.com/api/v2/json/organizations/codeforamerica/public_members").
-        to_return(:body => fixture("v2/users.json"))
+      stub_get("https://api.github.com/orgs/codeforamerica/members").
+        to_return(:body => fixture("v3/organization_members.json"))
       users = @client.organization_members("codeforamerica")
-      users.first.name.should == "Erik Michaels-Ober"
+      users.first.login.should == "akit"
     end
 
   end
@@ -96,8 +96,8 @@ describe Octokit::Client::Organizations do
   describe ".organization_teams" do
 
     it "should return all teams for an organization" do
-      stub_get("https://github.com/api/v2/json/organizations/codeforamerica/teams").
-        to_return(:body => fixture("v2/teams.json"))
+      stub_get("https://api.github.com/orgs/codeforamerica/teams").
+        to_return(:body => fixture("v3/teams.json"))
       teams = @client.organization_teams("codeforamerica")
       teams.first.name.should == "Fellows"
     end
@@ -107,9 +107,9 @@ describe Octokit::Client::Organizations do
   describe ".create_team" do
 
     it "should create a team" do
-      stub_post("https://github.com/api/v2/json/organizations/codeforamerica/teams").
+      stub_post("https://api.github.com/orgs/codeforamerica/teams").
         with(:name => "Fellows").
-        to_return(:body => fixture("v2/team.json"))
+        to_return(:body => fixture("v3/team.json"))
       team = @client.create_team("codeforamerica", {:name => "Fellows"})
       team.name.should == "Fellows"
     end
@@ -119,8 +119,8 @@ describe Octokit::Client::Organizations do
   describe ".team" do
 
     it "should return a team" do
-      stub_get("https://github.com/api/v2/json/teams/32598").
-        to_return(:body => fixture("v2/team.json"))
+      stub_get("https://api.github.com/teams/32598").
+        to_return(:body => fixture("v3/team.json"))
       team = @client.team(32598)
       team.name.should == "Fellows"
     end
@@ -130,9 +130,9 @@ describe Octokit::Client::Organizations do
   describe ".update_team" do
 
     it "should update a team" do
-      stub_put("https://github.com/api/v2/json/teams/32598").
+      stub_patch("https://api.github.com/teams/32598").
         with(:name => "Fellows").
-        to_return(:body => fixture("v2/team.json"))
+        to_return(:body => fixture("v3/team.json"))
       team = @client.update_team(32598, :name => "Fellows")
       team.name.should == "Fellows"
     end
@@ -142,32 +142,22 @@ describe Octokit::Client::Organizations do
   describe ".delete_team" do
 
     it "should delete a team" do
-      stub_delete("https://github.com/api/v2/json/teams/32598").
-        to_return(:body => fixture("v2/team.json"))
-      team = @client.delete_team(32598)
-      team.name.should == "Fellows"
+      stub_delete("https://api.github.com/teams/32598").
+        to_return(:status => 204)
+      result = @client.delete_team(32598)
+      result.status.should == 204
     end
 
   end
 
-  describe ".delete_team" do
-
-    it "should delete a team" do
-      stub_delete("https://github.com/api/v2/json/teams/32598").
-        to_return(:body => fixture("v2/team.json"))
-      team = @client.delete_team(32598)
-      team.name.should == "Fellows"
-    end
-
-  end
 
   describe ".team_members" do
 
     it "should return team members" do
-      stub_get("https://github.com/api/v2/json/teams/32598/members").
-        to_return(:body => fixture("v2/users.json"))
-      users = @client.team_members(32598)
-      users.first.name.should == "Erik Michaels-Ober"
+      stub_get("https://api.github.com/teams/33239/members").
+        to_return(:body => fixture("v3/organization_team_members.json"))
+      users = @client.team_members(33239)
+      users.first.login.should == "ctshryock"
     end
 
   end
@@ -175,11 +165,11 @@ describe Octokit::Client::Organizations do
   describe ".add_team_member" do
 
     it "should add a team member" do
-      stub_post("https://github.com/api/v2/json/teams/32598/members").
+      stub_put("https://api.github.com/teams/32598/members/sferik").
         with(:name => "sferik").
-        to_return(:body => fixture("v2/user.json"))
-      user = @client.add_team_member(32598, "sferik")
-      user.name.should == "Erik Michaels-Ober"
+        to_return(:status => 204)
+      result = @client.add_team_member(32598, "sferik")
+      result.should be_true
     end
 
   end
@@ -187,11 +177,10 @@ describe Octokit::Client::Organizations do
   describe ".remove_team_member" do
 
     it "should remove a team member" do
-      stub_delete("https://github.com/api/v2/json/teams/32598/members").
-        with(:query => {:name => "sferik"}).
-        to_return(:body => fixture("v2/user.json"))
-      user = @client.remove_team_member(32598, "sferik")
-      user.name.should == "Erik Michaels-Ober"
+      stub_delete("https://api.github.com/teams/32598/members/sferik").
+        to_return(:status => 204)
+      result = @client.remove_team_member(32598, "sferik")
+      result.should be_true
     end
 
   end
@@ -199,10 +188,11 @@ describe Octokit::Client::Organizations do
   describe ".team_repositories" do
 
     it "should return team repositories" do
-      stub_get("https://github.com/api/v2/json/teams/32598/repositories").
-        to_return(:body => fixture("v2/repositories.json"))
-      repositories = @client.team_repositories(32598)
-      repositories.first.name.should == "One40Proof"
+      stub_get("https://api.github.com/teams/33239/repos").
+        to_return(:body => fixture("v3/organization_team_repos.json"))
+      repositories = @client.team_repositories(33239)
+      repositories.first.name.should == "GitTalk"
+      repositories.first.owner.id.should == 570695
     end
 
   end
@@ -210,11 +200,11 @@ describe Octokit::Client::Organizations do
   describe ".add_team_repository" do
 
     it "should add a team repository" do
-      stub_post("https://github.com/api/v2/json/teams/32598/repositories").
+      stub_put("https://api.github.com/teams/32598/repos/reddavis/One40Proof").
         with(:name => "reddavis/One40Proof").
-        to_return(:body => fixture("v2/repositories.json"))
-      repositories = @client.add_team_repository(32598, "reddavis/One40Proof")
-      repositories.first.name.should == "One40Proof"
+        to_return(:status => 204)
+      result = @client.add_team_repository(32598, "reddavis/One40Proof")
+      result.should be_true
     end
 
   end
@@ -222,11 +212,10 @@ describe Octokit::Client::Organizations do
   describe ".remove_team_repository" do
 
     it "should remove a team repository" do
-      stub_delete("https://github.com/api/v2/json/teams/32598/repositories").
-        with(:query => {:name => "reddavis/One40Proof"}).
-        to_return(:body => fixture("v2/repositories.json"))
-      repositories = @client.remove_team_repository(32598, "reddavis/One40Proof")
-      repositories.first.name.should == "One40Proof"
+      stub_delete("https://api.github.com/teams/32598/repos/reddavis/One40Proof").
+        to_return(:status => 204)
+      result = @client.remove_team_repository(32598, "reddavis/One40Proof")
+      result.should be_true
     end
 
   end