octokit 1.25.0 → 2.0.0.pre

data/spec/octokit/client/objects_spec.rb

@@ -1,109 +1,71 @@
-# -*- encoding: utf-8 -*-
 require 'helper'
 
 describe Octokit::Client::Objects do
 
   before do
-    @client = Octokit::Client.new(:login => 'sferik')
+    Octokit.reset!
+    @client = oauth_client
   end
 
-  describe ".tree" do
-
-    it "returns a tree" do
-      stub_get("https://api.github.com/repos/sferik/rails_admin/git/trees/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(json_response("tree.json"))
+  describe ".tree", :vcr do
+    it "gets a tree" do
       result = @client.tree("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
-      expect(result.sha).to eq("3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
-      expect(result.tree.first.path).to eq(".gitignore")
+      expect(result.sha).to eq "3cdfabd973bc3caac209cba903cfdb3bf6636bcd"
+      expect(result.tree.first.path).to eq ".gitignore"
+      assert_requested :get, github_url("/repos/sferik/rails_admin/git/trees/3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
     end
+    it "gets a tree recursively" do
+      result = @client.tree("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd", :recursive => true)
+      expect(result.sha).to eq "3cdfabd973bc3caac209cba903cfdb3bf6636bcd"
+      expect(result.tree.first.path).to eq ".gitignore"
+      assert_requested :get, github_url("/repos/sferik/rails_admin/git/trees/3cdfabd973bc3caac209cba903cfdb3bf6636bcd?recursive=true")
+    end
+  end # .tree
 
-  end
-
-  describe ".create_tree" do
-
+  describe ".create_tree", :vcr do
     it "creates a tree" do
-      stub_post("/repos/octocat/Hello-World/git/trees").
-        with(:body => { :tree => [ { :path => "file.rb", "mode" => "100644", "type" => "blob", "sha" => "44b4fc6d56897b048c772eb4087f854f46256132" } ] },
-             :headers => { "Content-Type" => "application/json" }).
-        to_return(json_response("tree_create.json"))
-      response = @client.create_tree("octocat/Hello-World", [ { "path" => "file.rb", "mode" => "100644", "type" => "blob", "sha" => "44b4fc6d56897b048c772eb4087f854f46256132" } ])
-      expect(response.sha).to eq("cd8274d15fa3ae2ab983129fb037999f264ba9a7")
-      expect(response.tree.size).to eq(1)
-      expect(response.tree.first.sha).to eq("7c258a9869f33c1e1e1f74fbb32f07c86cb5a75b")
+      tree = @client.create_tree("api-playground/api-sandbox", [ { "path" => "wynning.rb", "mode" => "100644", "type" => "blob", :content => "require 'fun'"} ])
+      assert_requested :post, github_url("/repos/api-playground/api-sandbox/git/trees")
     end
+  end # .create_tree
 
-  end
-
-  describe ".blob" do
-
+  describe ".blob", :vcr do
     it "returns a blob" do
-      stub_get("https://api.github.com/repos/sferik/rails_admin/git/blobs/94616fa57520ac8147522c7cf9f03d555595c5ea").
-        to_return(json_response("blob.json"))
       blob = @client.blob("sferik/rails_admin", "94616fa57520ac8147522c7cf9f03d555595c5ea")
-      expect(blob.sha).to eq("94616fa57520ac8147522c7cf9f03d555595c5ea")
+      expect(blob.sha).to eq "94616fa57520ac8147522c7cf9f03d555595c5ea"
+      assert_requested :get, github_url("/repos/sferik/rails_admin/git/blobs/94616fa57520ac8147522c7cf9f03d555595c5ea")
     end
+  end # .blob
 
-  end
-
-  describe ".create_blob" do
-
+  describe ".create_blob", :vcr do
     it "creates a blob" do
-      stub_post("/repos/octocat/Hello-World/git/blobs").
-        with(:body => { :content => "content", :encoding => "utf-8" },
-             :headers => { "Content-Type" => "application/json" }).
-        to_return(json_response("blob_create.json"))
-      blob = @client.create_blob("octocat/Hello-World", "content")
-      expect(blob).to eq("3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15")
+      blob = @client.create_blob("api-playground/api-sandbox", "content")
+      assert_requested :post, github_url("/repos/api-playground/api-sandbox/git/blobs")
     end
+  end # .create_blob
 
-  end
-
-  describe ".tag" do
-
+  describe ".tag", :vcr do
     it "returns a tag" do
-      stub_get("/repos/pengwynn/octokit/git/tags/23aad20633f4d2981b1c7209a800db3014774e96").
-        to_return(json_response("tag.json"))
-      tag = @client.tag("pengwynn/octokit", "23aad20633f4d2981b1c7209a800db3014774e96")
-      expect(tag.sha).to eq("23aad20633f4d2981b1c7209a800db3014774e96")
-      expect(tag.message).to eq("Version 1.4.0\n")
-      expect(tag.tag).to eq("v1.4.0")
+      tag = @client.tag("octokit/octokit.rb", "23aad20633f4d2981b1c7209a800db3014774e96")
+      assert_requested :get, github_url("/repos/octokit/octokit.rb/git/tags/23aad20633f4d2981b1c7209a800db3014774e96")
     end
+  end # .tag
 
-  end
-
-  describe ".create_tag" do
-
+  describe ".create_tag", :vcr do
     it "creates a tag" do
-      stub_post("/repos/pengwynn/octokit/git/tags").
-        with(:body => {
-                :tag => "v9000.0.0",
-                :message => "Version 9000\n",
-                :object => "f4cdf6eb734f32343ce3f27670c17b35f54fd82e",
-                :type => "commit",
-                :tagger => {
-                  :name => "Wynn Netherland",
-                  :email => "wynn.netherland@gmail.com",
-                  :date => "2012-06-03T17:03:11-07:00"
-                }
-              },
-            :headers => { "Content-Type" => "application/json" }).
-              to_return(json_response("tag_create.json"))
       tag = @client.create_tag(
-        "pengwynn/octokit",
+        "api-playground/api-sandbox",
         "v9000.0.0",
         "Version 9000\n",
-        "f4cdf6eb734f32343ce3f27670c17b35f54fd82e",
+        "eb11b3141c9dec3ba88d15b499d597a65df15320",
         "commit",
         "Wynn Netherland",
         "wynn.netherland@gmail.com",
         "2012-06-03T17:03:11-07:00"
       )
-      expect(tag.tag).to eq("v9000.0.0")
-      expect(tag.message).to eq("Version 9000\n")
-      expect(tag.sha).to eq("23aad20633f4d2981b1c7209a800db3014774e96")
+      expect(tag.tag).to eq "v9000.0.0"
+      assert_requested :post, github_url("/repos/api-playground/api-sandbox/git/tags")
     end
-
-  end
-
+  end # .create_tag
 
 end

data/spec/octokit/client/organizations_spec.rb

@@ -1,319 +1,197 @@
-# -*- encoding: utf-8 -*-
 require 'helper'
 
 describe Octokit::Client::Organizations do
 
   before do
-    @client = Octokit::Client.new(:login => 'sferik')
+    Octokit.reset!
+    @client = oauth_client
   end
 
-  describe ".organization" do
-
+  describe ".organization", :vcr do
     it "returns an organization" do
-      stub_get("https://api.github.com/orgs/codeforamerica").
-        to_return(json_response("organization.json"))
       organization = @client.organization("codeforamerica")
-      expect(organization.name).to eq("Code For America")
+      expect(organization.name).to eq "Code For America"
+      assert_requested :get, github_url("/orgs/codeforamerica")
     end
+  end # .organization
 
-  end
-
-  describe ".update_organization" do
-
+  describe ".update_organization", :vcr do
     it "updates an organization" do
-      stub_patch("https://api.github.com/orgs/codeforamerica").
-        with(:name => "Code For America").
-        to_return(json_response("organization.json"))
-      organization = @client.update_organization("codeforamerica", {:name => "Code For America"})
-      expect(organization.name).to eq("Code For America")
+      organization = @client.update_organization("api-playground", {:name => "API Playground"})
+      expect(organization.login).to eq "api-playground"
+      assert_requested :patch, github_url("/orgs/api-playground")
     end
+  end # .update_organization
 
-  end
-
-  describe ".organizations" do
-
-    context "with a user passed" do
-
-      it "returns all organizations for a user" do
-        stub_get("https://api.github.com/users/sferik/orgs").
-          to_return(json_response("organizations.json"))
-        organizations = @client.organizations("sferik")
-        expect(organizations.first.login).to eq("Hubcap")
-      end
-
+  describe ".organizations", :vcr do
+    it "returns all organizations for a user" do
+      organizations = @client.organizations("sferik")
+      expect(organizations).to be_kind_of Array
+      assert_requested :get, github_url("/users/sferik/orgs")
     end
-
-    context "without user passed" do
-
-      it "returns all organizations for a user" do
-        stub_get("https://api.github.com/user/orgs").
-          to_return(json_response("organizations.json"))
-        organizations = @client.organizations
-        expect(organizations.first.login).to eq("Hubcap")
-      end
-
+    it "returns all organizations for the authenticated user" do
+      organizations = @client.organizations
+      expect(organizations).to be_kind_of Array
+      assert_requested :get, github_url("/user/orgs")
     end
+  end # .organizations
 
-  end
-
-  describe ".organization_repositories" do
-
+  describe ".organization_repositories", :vcr do
     it "returns all public repositories for an organization" do
-      stub_get("https://api.github.com/orgs/codeforamerica/repos").
-        to_return(json_response("organization-repositories.json"))
       repositories = @client.organization_repositories("codeforamerica")
-      expect(repositories.first.name).to eq("cfahelloworld")
+      expect(repositories).to be_kind_of Array
+      assert_requested :get, github_url("/orgs/codeforamerica/repos")
     end
+  end # .organization_repositories
 
-  end
-
-  describe ".organization_members" do
-
+  describe ".organization_members", :vcr do
     it "returns all public members of an organization" do
-      stub_get("https://api.github.com/orgs/codeforamerica/members").
-        to_return(json_response("organization_members.json"))
       users = @client.organization_members("codeforamerica")
-      expect(users.first.login).to eq("akit")
-    end
-
-  end
-
-  describe ".organization_member?" do
-
-    context "user is actually a member of the organization" do
-
-      it "returns true" do
-        stub_get("https://api.github.com/orgs/github/members/pengwynn").
-          to_return(:status => 204)
-        is_hubbernaut = @client.organization_member?('github', 'pengwynn')
-        expect(is_hubbernaut).to eq(true)
-      end
-
+      expect(users).to be_kind_of Array
+      assert_requested :get, github_url("/orgs/codeforamerica/members")
     end
+  end # .organization_members
 
-    context "user is not actually a member of the organization" do
-
-      it "returns false" do
-        stub_get("https://api.github.com/orgs/github/members/joeyw").
-          to_return(:status => 404)
-        is_hubbernaut = @client.organization_member?('github', 'joeyw')
-        expect(is_hubbernaut).to be_false
-      end
-
-    end
-
-  end
-
-  describe ".organization_public_member?" do
-
-    context "user is actually a public member of the organization" do
-
-      it "returns true" do
-        stub_get("https://api.github.com/orgs/github/public_members/pengwynn").
-          to_return(:status => 204)
-        is_hubbernaut = @client.organization_public_member?('github', 'pengwynn')
-        expect(is_hubbernaut).to eq(true)
-      end
-
+  describe ".organization_member?", :vcr do
+    it "checks organization membership" do
+      is_hubbernaut = @client.organization_member?('github', 'pengwynn')
+      assert_requested :get, github_url("/orgs/github/members/pengwynn")
+      expect(is_hubbernaut).to be_true
     end
+  end # .organization_member?
 
-    context "user is not actually a public member of the organization" do
-
-      it "returns false" do
-        stub_get("https://api.github.com/orgs/github/public_members/joeyw").
-          to_return(:status => 404)
-        is_hubbernaut = @client.organization_public_member?('github', 'joeyw')
-        expect(is_hubbernaut).to be_false
-      end
-
+  describe ".organization_public_member?", :vcr do
+    it "checks publicized org membership" do
+      is_hubbernaut = @client.organization_public_member?('github', 'pengwynn')
+      expect(is_hubbernaut).to be_true
+      assert_requested :get, github_url("/orgs/github/public_members/pengwynn")
     end
+  end # .organization_public_member?
 
-  end
-
-  describe ".organization_teams" do
-
+  describe ".organization_teams", :vcr do
     it "returns all teams for an organization" do
-      stub_get("https://api.github.com/orgs/codeforamerica/teams").
-        to_return(json_response("teams.json"))
-      teams = @client.organization_teams("codeforamerica")
-      expect(teams.first.name).to eq("Fellows")
-    end
-
-  end
-
-  describe ".create_team" do
-
-    it "creates a team" do
-      stub_post("https://api.github.com/orgs/codeforamerica/teams").
-        with(:name => "Fellows").
-        to_return(json_response("team.json"))
-      team = @client.create_team("codeforamerica", {:name => "Fellows"})
-      expect(team.name).to eq("Fellows")
-    end
-
-  end
-
-  describe ".team" do
-
-    it "returns a team" do
-      stub_get("https://api.github.com/teams/32598").
-        to_return(json_response("team.json"))
-      team = @client.team(32598)
-      expect(team.name).to eq("Fellows")
-    end
-
-  end
-
-  describe ".update_team" do
-
-    it "updates a team" do
-      stub_patch("https://api.github.com/teams/32598").
-        with(:name => "Fellows").
-        to_return(json_response("team.json"))
-      team = @client.update_team(32598, :name => "Fellows")
-      expect(team.name).to eq("Fellows")
+      teams = @client.organization_teams("api-playground")
+      expect(teams).to be_kind_of Array
+      assert_requested :get, github_url("/orgs/api-playground/teams")
     end
+  end # .organization_teams
 
-  end
 
-  describe ".delete_team" do
+  context "methods that require a new team", :order => :default do
 
-    it "deletes a team" do
-      stub_delete("https://api.github.com/teams/32598").
-        to_return(:status => 204)
-      result = @client.delete_team(32598)
-      expect(result).to eq(true)
+    before(:each) do
+      @team_name = "Test Team #{Time.now.to_i}"
+      @team = @client.create_team("api-playground", {:name => @team_name})
     end
 
-  end
-
-
-  describe ".team_members" do
-
-    it "returns team members" do
-      stub_get("https://api.github.com/teams/33239/members").
-        to_return(json_response("organization_team_members.json"))
-      users = @client.team_members(33239)
-      expect(users.first.login).to eq("ctshryock")
+    after(:each) do
+      @client.delete_team(@team.id)
     end
 
-  end
-
-  describe ".add_team_member" do
+    describe ".create_team", :vcr do
+      it "creates a team" do
+        assert_requested :post, github_url("/orgs/api-playground/teams")
+      end
+    end # .create_team
 
-    it "adds a team member" do
-      stub_put("https://api.github.com/teams/32598/members/sferik").
-        with(:name => "sferik").
-        to_return(:status => 204)
-      result = @client.add_team_member(32598, "sferik")
-      expect(result).to eq(true)
-    end
+    describe ".team", :vcr do
+      it "returns a team" do
+        team = @client.team(@team.id)
+        expect(team.id).to eq @team.id
+        assert_requested :get, github_url("/teams/#{@team.id}")
+      end
+    end # .team
 
-  end
+    describe ".update_team", :vcr do
+      it "updates a team" do
+        team = @client.update_team(@team.id, :name => "API Jedi")
+        assert_requested :patch, github_url("/teams/#{@team.id}")
+      end
+    end # .update_team
 
-  describe ".remove_team_member" do
+    describe ".team_members", :vcr do
+      it "returns team members" do
+        users = @client.team_members(@team.id)
+        expect(users).to be_kind_of Array
+        assert_requested :get, github_url("/teams/#{@team.id}/members")
+      end
+    end # .team_members
 
-    it "removes a team member" do
-      stub_delete("https://api.github.com/teams/32598/members/sferik").
-        to_return(:status => 204)
-      result = @client.remove_team_member(32598, "sferik")
-      expect(result).to eq(true)
-    end
+    describe ".add_team_member", :vcr do
+      it "adds a team member" do
+        result = @client.add_team_member(@team.id, "api-padawan")
+        assert_requested :put, github_url("/teams/#{@team.id}/members/api-padawan")
+      end
+    end # .add_team_member
 
-  end
+    describe ".remove_team_member", :vcr do
+      it "removes a team member" do
+        result = @client.remove_team_member(@team.id, "api-padawan")
+        assert_requested :delete, github_url("/teams/#{@team.id}/members/api-padawan")
+      end
+    end # .remove_team_member
 
-  describe ".team_member?" do
+    describe ".team_member?", :vcr do
+      it "checks if a user is member of a team" do
+        is_team_member = @client.team_member?(@team.id, 'api-padawan')
+        assert_requested :get, github_url("/teams/#{@team.id}/members/api-padawan")
+      end
+    end # .team_member?
 
-    context "user is actually a member of the team" do
+    describe ".team_repositories", :vcr do
+      it "returns team repositories" do
+        repositories = @client.team_repositories(@team.id)
+        expect(repositories).to be_kind_of Array
+        assert_requested :get, github_url("/teams/#{@team.id}/repos")
+      end
+    end # .team_repositories
 
-      it "returns true" do
-        stub_get("https://api.github.com/teams/32598/members/pengwynn").
-          to_return(:status => 204)
-        is_team_member = @client.team_member?(32598, 'pengwynn')
-        expect(is_team_member).to eq(true)
+    describe ".add_team_repository", :vcr do
+      it "adds a team repository" do
+        result = @client.add_team_repository(@team.id, "api-playground/api-sandbox")
+        assert_requested :put, github_url("/teams/#{@team.id}/repos/api-playground/api-sandbox")
       end
+    end # .add_team_repository
 
-    end
+    describe ".remove_team_repository", :vcr do
+      it "removes a team repository" do
+        result = @client.remove_team_repository(@team.id, "api-playground/api-sandbox")
+        assert_requested :delete, github_url("/teams/#{@team.id}/repos/api-playground/api-sandbox")
+      end
+    end #.remove_team_repository
 
-    context "user is not actually a member of the team" do
+    describe ".publicize_membership", :vcr do
+      it "publicizes membership" do
+        result = @client.publicize_membership("api-playground", "api-padawan")
+        assert_requested :put, github_url("/orgs/api-playground/public_members/api-padawan")
+      end
+    end # .publicize_membership
 
-      it "returns false" do
-        stub_get("https://api.github.com/teams/32598/members/joeyw").
-          to_return(:status => 404)
-        is_team_member = @client.team_member?(32598, 'joeyw')
-        expect(is_team_member).to be_false
+    describe ".unpublicize_membership", :vcr do
+      it "unpublicizes membership" do
+        result = @client.unpublicize_membership("api-playground", "api-padawan")
+        assert_requested :delete, github_url("/orgs/api-playground/public_members/api-padawan")
       end
+    end # .unpublicize_membership
 
-    end
+    describe ".delete_team", :vcr do
+      it "deletes a team" do
+        result = @client.delete_team(@team.id)
+        assert_requested :delete, github_url("/teams/#{@team.id}")
+      end
+    end # .delete_team
 
-  end
+  end # new team methods
 
-  describe ".remove_organization_member" do
+  describe ".remove_organization_member", :vcr do
     it "removes a member from an organization" do
-      stub_delete("https://api.github.com/orgs/codeforamerica/members/glow-mdsol").
-          to_return(:status => 204)
-      result = @client.remove_organization_member("codeforamerica", "glow-mdsol")
-      expect(result).to eq(true)
-    end
-
-  end
-  describe ".team_repositories" do
-
-    it "returns team repositories" do
-      stub_get("https://api.github.com/teams/33239/repos").
-        to_return(json_response("organization_team_repos.json"))
-      repositories = @client.team_repositories(33239)
-      expect(repositories.first.name).to eq("GitTalk")
-      expect(repositories.first.owner.id).to eq(570695)
-    end
-
-  end
-
-  describe ".add_team_repository" do
-
-    it "adds a team repository" do
-      stub_put("https://api.github.com/teams/32598/repos/reddavis/One40Proof").
-        with(:name => "reddavis/One40Proof").
-        to_return(:status => 204)
-      result = @client.add_team_repository(32598, "reddavis/One40Proof")
-      expect(result).to eq(true)
-    end
-
-  end
-
-  describe ".remove_team_repository" do
-
-    it "removes a team repository" do
-      stub_delete("https://api.github.com/teams/32598/repos/reddavis/One40Proof").
-        to_return(:status => 204)
-      result = @client.remove_team_repository(32598, "reddavis/One40Proof")
-      expect(result).to eq(true)
-    end
-
-  end
-
-  describe ".publicize_membership" do
-
-    it "pulicizes membership" do
-      stub_put("https://api.github.com/orgs/codeforamerica/public_members/sferik").
-        with(:name => "sferik").
-        to_return(:status => 204)
-      result = @client.publicize_membership("codeforamerica", "sferik")
-      expect(result).to eq(true)
-    end
-
-  end
-
-  describe ".unpublicize_membership" do
-
-    it "unpulicizes membership" do
-      stub_delete("https://api.github.com/orgs/codeforamerica/public_members/sferik").
-        with(:name => "sferik").
-        to_return(:status => 204)
-      result = @client.unpublicize_membership("codeforamerica", "sferik")
-      expect(result).to eq(true)
-    end
-
-  end
+      VCR.eject_cassette
+      VCR.turn_off!
+      stub_delete github_url("/orgs/api-playground/members/api-padawan")
+      result = @client.remove_organization_member("api-playground", "api-padawan")
+      assert_requested :delete, github_url("/orgs/api-playground/members/api-padawan")
+      VCR.turn_on!
+    end
+  end # .remove_organization_member
 
 end