octokit 1.18.0 → 1.19.0

data/spec/octokit/client/markdown_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Markdown do
 
     it "renders markdown" do
       stub_post("/markdown").
-        to_return(:body => fixture("v3/markdown_gfm"))
+        to_return(:body => fixture("markdown_gfm"))
       text = "This is for #111"
       markdown = @client.markdown(text, :context => 'pengwynn/octokit', :mode => 'gfm')
 

data/spec/octokit/client/milestones_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Milestones do
 
     it "lists milestones belonging to repository" do
       stub_get("/repos/pengwynn/octokit/milestones").
-        to_return(:status => 200, :body => fixture('v3/milestones.json'))
+        to_return(json_response('milestones.json'))
       milestones = @client.list_milestones("pengwynn/octokit")
       expect(milestones.first.description).to eq("Add support for API v3")
     end
@@ -22,7 +22,7 @@ describe Octokit::Client::Milestones do
 
     it "gets a single milestone belonging to repository" do
       stub_get("/repos/pengwynn/octokit/milestones/1").
-        to_return(:status => 200, :body => fixture('v3/milestone.json'))
+        to_return(json_response('milestone.json'))
       milestones = @client.milestone("pengwynn/octokit", 1)
       expect(milestones.description).to eq("Add support for API v3")
     end
@@ -33,8 +33,8 @@ describe Octokit::Client::Milestones do
 
     it "creates a single milestone" do
       stub_post("/repos/pengwynn/octokit/milestones").
-        with(:body => '{"title":"0.7.0"}', :headers => {'Content-Type'=>'application/json'}).
-        to_return(:status => 201, :body => fixture('v3/milestone.json'))
+        with(:body => '{"title":"0.7.0"}').
+        to_return(json_response('milestone.json'))
       milestone = @client.create_milestone("pengwynn/octokit", "0.7.0")
       expect(milestone.title).to eq("0.7.0")
     end
@@ -45,8 +45,8 @@ describe Octokit::Client::Milestones do
 
     it "updates a milestone" do
       stub_post("/repos/pengwynn/octokit/milestones/1").
-        with(:body => {"description" => "Add support for API v3"}, :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json'}).
-        to_return(:status => 200, :body => fixture('v3/milestone.json'))
+        with(:body => {"description" => "Add support for API v3"}).
+        to_return(json_response('milestone.json'))
       milestone = @client.update_milestone("pengwynn/octokit", 1, {:description => "Add support for API v3"})
       expect(milestone.description).to eq("Add support for API v3")
     end
@@ -58,8 +58,8 @@ describe Octokit::Client::Milestones do
     it "deletes a milestone from a repository" do
       stub_delete("/repos/pengwynn/octokit/milestones/2").
         to_return(:status => 204, :body => "", :headers => {})
-      response = @client.delete_milestone("pengwynn/octokit", 2)
-      expect(response.status).to eq(204)
+      result = @client.delete_milestone("pengwynn/octokit", 2)
+      expect(result).to be_true
     end
 
   end

data/spec/octokit/client/notifications_spec.rb

@@ -0,0 +1,141 @@
+# -*- encoding: utf-8 -*-
+require 'helper'
+
+describe Octokit::Client::Notifications do
+
+  before do
+    @client = Octokit::Client.new(:login => "joeyw")
+  end
+
+  describe ".notifications" do
+
+    it "lists the notifications for the current user" do
+      stub_get("https://api.github.com/notifications").
+        to_return(json_response("notifications.json"))
+      notifications = @client.notifications
+      expect(notifications.first.id).to eq(1)
+      expect(notifications.first.unread).to be_true
+    end
+
+  end
+
+  describe ".repository_notifications" do
+
+    it "lists all notifications for a repository" do
+      stub_get("https://api.github.com/repos/pengwynn/octokit/notifications").
+        to_return(json_response("repository_notifications.json"))
+      notifications = @client.repository_notifications("pengwynn/octokit")
+      expect(notifications.first.id).to eq(1)
+      expect(notifications.first.unread).to be_true
+    end
+
+  end
+
+  describe ".mark_notifications_as_read" do
+
+    it "returns true when notifications are marked as read" do
+      stub_put("https://api.github.com/notifications").
+        to_return(:status => 205)
+      result = @client.mark_notifications_as_read
+      expect(result).to be_true
+    end
+
+    it "returns false when unsuccessful" do
+      stub_put("https://api.github.com/notifications").
+        to_return(:status => 500)
+      result = @client.mark_notifications_as_read
+      expect(result).to be_false
+    end
+
+  end
+
+  describe ".mark_repository_notifications_as_read" do
+
+    it "returns true when notifications for a repo are marked as read" do
+      stub_put("https://api.github.com/repos/pengwynn/octokit/notifications").
+        to_return(:status => 205)
+      result = @client.mark_repository_notifications_as_read("pengwynn/octokit")
+      expect(result).to be_true
+    end
+
+    it "returns false when unsuccessful" do
+      stub_put("https://api.github.com/repos/pengwynn/octokit/notifications").
+        to_return(:status => 500)
+      result = @client.mark_repository_notifications_as_read("pengwynn/octokit")
+      expect(result).to be_false
+    end
+
+  end
+
+  describe ".thread_notifications" do
+
+    it "returns notifications for a specific thread" do
+      stub_get("https://api.github.com/notifications/threads/1").
+        to_return(json_response('notification_thread.json'))
+      notifications = @client.thread_notifications(1)
+      expect(notifications.first.id).to eq(1)
+      expect(notifications.first.unread).to be_true
+    end
+
+  end
+
+  describe ".mark_thread_as_read" do
+
+    it "marks a thread as read" do
+      stub_patch("https://api.github.com/notifications/threads/1").
+        to_return(:status => 205)
+      result = @client.mark_thread_as_read(1)
+      expect(result).to be_true
+    end
+
+    it "returns false when unsuccessful" do
+      stub_patch("https://api.github.com/notifications/threads/1").
+        to_return(:status => 500)
+      result = @client.mark_thread_as_read(1)
+      expect(result).to be_false
+    end
+
+  end
+
+  describe ".thread_subscription" do
+
+    it "returns a thread subscription" do
+      stub_get("https://api.github.com/notifications/threads/1/subscription").
+        to_return(json_response("thread_subscription.json"))
+      subscription = @client.thread_subscription(1)
+      expect(subscription.subscribed).to be_true
+    end
+
+  end
+
+  describe ".update_thread_subscription" do
+
+    it "updates a thread subscription" do
+      stub_put("https://api.github.com/notifications/threads/1/subscription").
+        to_return(json_response("thread_subscription_update.json"))
+      subscription = @client.update_thread_subscription(1, :subscribed => true)
+      expect(subscription.subscribed).to be_true
+    end
+
+  end
+
+  describe ".delete_thread_subscription" do
+
+    it "returns true with successful thread deletion" do
+      stub_delete("https://api.github.com/notifications/threads/1").
+        to_return(:status => 204)
+      result = @client.delete_thread_subscription(1)
+      expect(result).to be_true
+    end
+
+    it "returns false when subscription deletion fails" do
+      stub_delete("https://api.github.com/notifications/threads/1").
+        to_return(:status => 500)
+      result = @client.delete_thread_subscription(1)
+      expect(result).to be_false
+    end
+
+
+  end
+
+end

data/spec/octokit/client/objects_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Objects do
 
     it "returns a tree" do
       stub_get("https://api.github.com/repos/sferik/rails_admin/git/trees/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("v3/tree.json"))
+        to_return(json_response("tree.json"))
       result = @client.tree("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       expect(result.sha).to eq("3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       expect(result.tree.first.path).to eq(".gitignore")
@@ -25,7 +25,7 @@ describe Octokit::Client::Objects 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(:body => fixture("v3/tree_create.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)
@@ -38,7 +38,7 @@ describe Octokit::Client::Objects do
 
     it "returns a blob" do
       stub_get("https://api.github.com/repos/sferik/rails_admin/git/blobs/94616fa57520ac8147522c7cf9f03d555595c5ea").
-        to_return(:body => fixture("v3/blob.json"))
+        to_return(json_response("blob.json"))
       blob = @client.blob("sferik/rails_admin", "94616fa57520ac8147522c7cf9f03d555595c5ea")
       expect(blob.sha).to eq("94616fa57520ac8147522c7cf9f03d555595c5ea")
     end
@@ -51,7 +51,7 @@ describe Octokit::Client::Objects do
       stub_post("/repos/octocat/Hello-World/git/blobs").
         with(:body => { :content => "content", :encoding => "utf-8" },
              :headers => { "Content-Type" => "application/json" }).
-        to_return(:body => fixture("v3/blob_create.json"))
+        to_return(json_response("blob_create.json"))
       blob = @client.create_blob("octocat/Hello-World", "content")
       expect(blob).to eq("3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15")
     end
@@ -62,7 +62,7 @@ describe Octokit::Client::Objects do
 
     it "returns a tag" do
       stub_get("/repos/pengwynn/octokit/git/tags/23aad20633f4d2981b1c7209a800db3014774e96").
-        to_return(:body => fixture("v3/tag.json"))
+        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")
@@ -87,7 +87,7 @@ describe Octokit::Client::Objects do
                 }
               },
             :headers => { "Content-Type" => "application/json" }).
-              to_return(:body => fixture("v3/tag_create.json"))
+              to_return(json_response("tag_create.json"))
       tag = @client.create_tag(
         "pengwynn/octokit",
         "v9000.0.0",

data/spec/octokit/client/organizations_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Organizations do
 
     it "returns an organization" do
       stub_get("https://api.github.com/orgs/codeforamerica").
-        to_return(:body => fixture("v3/organization.json"))
+        to_return(json_response("organization.json"))
       organization = @client.organization("codeforamerica")
       expect(organization.name).to eq("Code For America")
     end
@@ -23,7 +23,7 @@ describe Octokit::Client::Organizations do
     it "updates an organization" do
       stub_patch("https://api.github.com/orgs/codeforamerica").
         with(:name => "Code For America").
-        to_return(:body => fixture("v3/organization.json"))
+        to_return(json_response("organization.json"))
       organization = @client.update_organization("codeforamerica", {:name => "Code For America"})
       expect(organization.name).to eq("Code For America")
     end
@@ -36,7 +36,7 @@ describe Octokit::Client::Organizations do
 
       it "returns all organizations for a user" do
         stub_get("https://api.github.com/users/sferik/orgs").
-          to_return(:body => fixture("v3/organizations.json"))
+          to_return(json_response("organizations.json"))
         organizations = @client.organizations("sferik")
         expect(organizations.first.login).to eq("Hubcap")
       end
@@ -47,7 +47,7 @@ describe Octokit::Client::Organizations do
 
       it "returns all organizations for a user" do
         stub_get("https://api.github.com/user/orgs").
-          to_return(:body => fixture("v3/organizations.json"))
+          to_return(json_response("organizations.json"))
         organizations = @client.organizations
         expect(organizations.first.login).to eq("Hubcap")
       end
@@ -60,7 +60,7 @@ describe Octokit::Client::Organizations do
 
     it "returns all public repositories for an organization" do
       stub_get("https://api.github.com/orgs/codeforamerica/repos").
-        to_return(:body => fixture("v3/organization-repositories.json"))
+        to_return(json_response("organization-repositories.json"))
       repositories = @client.organization_repositories("codeforamerica")
       expect(repositories.first.name).to eq("cfahelloworld")
     end
@@ -71,18 +71,70 @@ describe Octokit::Client::Organizations do
 
     it "returns all public members of an organization" do
       stub_get("https://api.github.com/orgs/codeforamerica/members").
-        to_return(:body => fixture("v3/organization_members.json"))
+        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 be_true
+      end
+
+    end
+
+    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 be_true
+      end
+
+    end
+
+    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
+
+    end
+
+  end
+
   describe ".organization_teams" do
 
     it "returns all teams for an organization" do
       stub_get("https://api.github.com/orgs/codeforamerica/teams").
-        to_return(:body => fixture("v3/teams.json"))
+        to_return(json_response("teams.json"))
       teams = @client.organization_teams("codeforamerica")
       expect(teams.first.name).to eq("Fellows")
     end
@@ -94,7 +146,7 @@ describe Octokit::Client::Organizations do
     it "creates a team" do
       stub_post("https://api.github.com/orgs/codeforamerica/teams").
         with(:name => "Fellows").
-        to_return(:body => fixture("v3/team.json"))
+        to_return(json_response("team.json"))
       team = @client.create_team("codeforamerica", {:name => "Fellows"})
       expect(team.name).to eq("Fellows")
     end
@@ -105,7 +157,7 @@ describe Octokit::Client::Organizations do
 
     it "returns a team" do
       stub_get("https://api.github.com/teams/32598").
-        to_return(:body => fixture("v3/team.json"))
+        to_return(json_response("team.json"))
       team = @client.team(32598)
       expect(team.name).to eq("Fellows")
     end
@@ -117,7 +169,7 @@ describe Octokit::Client::Organizations do
     it "updates a team" do
       stub_patch("https://api.github.com/teams/32598").
         with(:name => "Fellows").
-        to_return(:body => fixture("v3/team.json"))
+        to_return(json_response("team.json"))
       team = @client.update_team(32598, :name => "Fellows")
       expect(team.name).to eq("Fellows")
     end
@@ -130,7 +182,7 @@ describe Octokit::Client::Organizations do
       stub_delete("https://api.github.com/teams/32598").
         to_return(:status => 204)
       result = @client.delete_team(32598)
-      expect(result.status).to eq(204)
+      expect(result).to be_true
     end
 
   end
@@ -140,7 +192,7 @@ describe Octokit::Client::Organizations do
 
     it "returns team members" do
       stub_get("https://api.github.com/teams/33239/members").
-        to_return(:body => fixture("v3/organization_team_members.json"))
+        to_return(json_response("organization_team_members.json"))
       users = @client.team_members(33239)
       expect(users.first.login).to eq("ctshryock")
     end
@@ -183,7 +235,7 @@ describe Octokit::Client::Organizations do
 
     it "returns team repositories" do
       stub_get("https://api.github.com/teams/33239/repos").
-        to_return(:body => fixture("v3/organization_team_repos.json"))
+        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)

data/spec/octokit/client/pub_sub_hubbub/service_hooks_spec.rb

@@ -14,12 +14,12 @@ describe Octokit::Client::PubSubHubbub::ServiceHooks do
       }
     }
     it "subscribes to pull events on specified topic" do
-      stub_post("/hub?access_token=myfaketoken").
+      stub_post("/hub").
         with(subscribe_request_body).
         to_return(:body => nil)
 
       expect(client.subscribe_service_hook("joshk/completeness-fu", "Travis", { :token => 'travistoken' })).to eq(true)
-      assert_requested :post, "https://api.github.com/hub?access_token=myfaketoken", :body => subscribe_request_body, :times => 1
+      assert_requested :post, "https://api.github.com/hub", :body => subscribe_request_body, :times => 1
     end
   end
 
@@ -33,12 +33,12 @@ describe Octokit::Client::PubSubHubbub::ServiceHooks do
     }
 
     it "unsubscribes to stop receiving events on specified topic" do
-      stub_post("/hub?access_token=myfaketoken").
+      stub_post("/hub").
         with(unsubscribe_request_body).
         to_return(:body => nil)
 
       expect(client.unsubscribe_service_hook("joshk/completeness-fu", "Travis")).to eq(true)
-      assert_requested :post, "https://api.github.com/hub?access_token=myfaketoken", :body => unsubscribe_request_body, :times => 1
+      assert_requested :post, "https://api.github.com/hub", :body => unsubscribe_request_body, :times => 1
     end
   end
 end