octokit 1.17.0 → 1.17.1

data/spec/octokit/client/markdown_spec.rb

@@ -9,13 +9,13 @@ describe Octokit::Client::Markdown do
       @client = Octokit::Client.new
     end
 
-    it "should render markdown" do
+    it "renders markdown" do
       stub_post("/markdown").
         to_return(:body => fixture("v3/markdown_gfm"))
       text = "This is for #111"
       markdown = @client.markdown(text, :context => 'pengwynn/octokit', :mode => 'gfm')
 
-      markdown.should include('https://github.com/pengwynn/octokit/issues/111')
+      expect(markdown).to include('https://github.com/pengwynn/octokit/issues/111')
     end
 
   end

data/spec/octokit/client/milestones_spec.rb

@@ -9,57 +9,57 @@ describe Octokit::Client::Milestones do
 
   describe ".list_milestones" do
 
-    it "should list milestones belonging to repository" do
+    it "lists milestones belonging to repository" do
       stub_get("/repos/pengwynn/octokit/milestones").
         to_return(:status => 200, :body => fixture('v3/milestones.json'))
       milestones = @client.list_milestones("pengwynn/octokit")
-      milestones.first.description.should == "Add support for API v3"
+      expect(milestones.first.description).to eq("Add support for API v3")
     end
 
   end
 
   describe ".milestone" do
 
-    it "should get a single milestone belonging to repository" 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'))
       milestones = @client.milestone("pengwynn/octokit", 1)
-      milestones.description.should == "Add support for API v3"
+      expect(milestones.description).to eq("Add support for API v3")
     end
 
   end
 
   describe ".create_milestone" do
 
-    it "should create a single milestone" 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'))
       milestone = @client.create_milestone("pengwynn/octokit", "0.7.0")
-      milestone.title.should == "0.7.0"
+      expect(milestone.title).to eq("0.7.0")
     end
 
   end
 
   describe ".update_milestone" do
 
-    it "should update a milestone" 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'))
       milestone = @client.update_milestone("pengwynn/octokit", 1, {:description => "Add support for API v3"})
-      milestone.description.should == "Add support for API v3"
+      expect(milestone.description).to eq("Add support for API v3")
     end
 
   end
 
   describe ".delete_milestone" do
 
-    it "should delete a milestone from a repository" 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)
-      response.status.should == 204
+      expect(response.status).to eq(204)
     end
 
   end

data/spec/octokit/client/objects_spec.rb

@@ -9,51 +9,51 @@ describe Octokit::Client::Objects do
 
   describe ".tree" do
 
-    it "should return a tree" 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"))
       result = @client.tree("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
-      result.sha.should == "3cdfabd973bc3caac209cba903cfdb3bf6636bcd"
-      result.tree.first.path.should == ".gitignore"
+      expect(result.sha).to eq("3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
+      expect(result.tree.first.path).to eq(".gitignore")
     end
 
   end
 
   describe ".create_tree" do
 
-    it "should create a tree" 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(:body => fixture("v3/tree_create.json"))
       response = @client.create_tree("octocat/Hello-World", [ { "path" => "file.rb", "mode" => "100644", "type" => "blob", "sha" => "44b4fc6d56897b048c772eb4087f854f46256132" } ])
-      response.sha.should == "cd8274d15fa3ae2ab983129fb037999f264ba9a7"
-      response.tree.size.should == 1
-      response.tree.first.sha.should == "7c258a9869f33c1e1e1f74fbb32f07c86cb5a75b"
+      expect(response.sha).to eq("cd8274d15fa3ae2ab983129fb037999f264ba9a7")
+      expect(response.tree.size).to eq(1)
+      expect(response.tree.first.sha).to eq("7c258a9869f33c1e1e1f74fbb32f07c86cb5a75b")
     end
 
   end
 
   describe ".blob" do
 
-    it "should return a blob" 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"))
       blob = @client.blob("sferik/rails_admin", "94616fa57520ac8147522c7cf9f03d555595c5ea")
-      blob.sha.should == "94616fa57520ac8147522c7cf9f03d555595c5ea"
+      expect(blob.sha).to eq("94616fa57520ac8147522c7cf9f03d555595c5ea")
     end
 
   end
 
   describe ".create_blob" do
 
-    it "should create a blob" 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(:body => fixture("v3/blob_create.json"))
       blob = @client.create_blob("octocat/Hello-World", "content")
-      blob.should == "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15"
+      expect(blob).to eq("3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15")
     end
 
   end

data/spec/octokit/client/organizations_spec.rb

@@ -9,23 +9,23 @@ describe Octokit::Client::Organizations do
 
   describe ".organization" do
 
-    it "should return an organization" do
+    it "returns an organization" do
       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"
+      expect(organization.name).to eq("Code For America")
     end
 
   end
 
   describe ".update_organization" do
 
-    it "should update an organization" 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"))
       organization = @client.update_organization("codeforamerica", {:name => "Code For America"})
-      organization.name.should == "Code For America"
+      expect(organization.name).to eq("Code For America")
     end
 
   end
@@ -34,22 +34,22 @@ describe Octokit::Client::Organizations do
 
     context "with a user passed" do
 
-      it "should return all organizations for a user" 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"))
         organizations = @client.organizations("sferik")
-        organizations.first.login.should == "Hubcap"
+        expect(organizations.first.login).to eq("Hubcap")
       end
 
     end
 
     context "without user passed" do
 
-      it "should return all organizations for a user" do
+      it "returns all organizations for a user" do
         stub_get("https://api.github.com/user/orgs").
           to_return(:body => fixture("v3/organizations.json"))
         organizations = @client.organizations
-        organizations.first.login.should == "Hubcap"
+        expect(organizations.first.login).to eq("Hubcap")
       end
 
     end
@@ -58,79 +58,79 @@ describe Octokit::Client::Organizations do
 
   describe ".organization_repositories" do
 
-    it "should return all public repositories for an organization" 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"))
       repositories = @client.organization_repositories("codeforamerica")
-      repositories.first.name.should == "cfahelloworld"
+      expect(repositories.first.name).to eq("cfahelloworld")
     end
 
   end
 
   describe ".organization_members" do
 
-    it "should return all public members of an organization" 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"))
       users = @client.organization_members("codeforamerica")
-      users.first.login.should == "akit"
+      expect(users.first.login).to eq("akit")
     end
 
   end
 
   describe ".organization_teams" do
 
-    it "should return all teams for an organization" 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"))
       teams = @client.organization_teams("codeforamerica")
-      teams.first.name.should == "Fellows"
+      expect(teams.first.name).to eq("Fellows")
     end
 
   end
 
   describe ".create_team" do
 
-    it "should create a team" 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"))
       team = @client.create_team("codeforamerica", {:name => "Fellows"})
-      team.name.should == "Fellows"
+      expect(team.name).to eq("Fellows")
     end
 
   end
 
   describe ".team" do
 
-    it "should return a team" do
+    it "returns a team" do
       stub_get("https://api.github.com/teams/32598").
         to_return(:body => fixture("v3/team.json"))
       team = @client.team(32598)
-      team.name.should == "Fellows"
+      expect(team.name).to eq("Fellows")
     end
 
   end
 
   describe ".update_team" do
 
-    it "should update a team" do
+    it "updates a team" do
       stub_patch("https://api.github.com/teams/32598").
         with(:name => "Fellows").
         to_return(:body => fixture("v3/team.json"))
       team = @client.update_team(32598, :name => "Fellows")
-      team.name.should == "Fellows"
+      expect(team.name).to eq("Fellows")
     end
 
   end
 
   describe ".delete_team" do
 
-    it "should delete a team" do
+    it "deletes a team" do
       stub_delete("https://api.github.com/teams/32598").
         to_return(:status => 204)
       result = @client.delete_team(32598)
-      result.status.should == 204
+      expect(result.status).to eq(204)
     end
 
   end
@@ -138,102 +138,102 @@ describe Octokit::Client::Organizations do
 
   describe ".team_members" do
 
-    it "should return team members" do
+    it "returns team members" do
       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"
+      expect(users.first.login).to eq("ctshryock")
     end
 
   end
 
   describe ".add_team_member" do
 
-    it "should add a team member" do
+    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")
-      result.should be_true
+      expect(result).to be_true
     end
 
   end
 
   describe ".remove_team_member" do
 
-    it "should remove a team member" do
+    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")
-      result.should be_true
+      expect(result).to be_true
     end
 
   end
 
   describe ".remove_organization_member" do
-    it "should remove a member from an organization" 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")
-      result.should be_true
+      expect(result).to be_true
     end
 
   end
   describe ".team_repositories" do
 
-    it "should return team repositories" do
+    it "returns team repositories" do
       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
+      expect(repositories.first.name).to eq("GitTalk")
+      expect(repositories.first.owner.id).to eq(570695)
     end
 
   end
 
   describe ".add_team_repository" do
 
-    it "should add a 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")
-      result.should be_true
+      expect(result).to be_true
     end
 
   end
 
   describe ".remove_team_repository" do
 
-    it "should remove a 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")
-      result.should be_true
+      expect(result).to be_true
     end
 
   end
 
   describe ".publicize_membership" do
 
-    it "should pulicize 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")
-      result.should be_true
+      expect(result).to be_true
     end
 
   end
 
   describe ".unpublicize_membership" do
 
-    it "should unpulicize 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")
-      result.should be_true
+      expect(result).to be_true
     end
 
   end

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

@@ -18,7 +18,7 @@ describe Octokit::Client::PubSubHubbub::ServiceHooks do
         with(subscribe_request_body).
         to_return(:body => nil)
 
-      client.subscribe_service_hook("joshk/completeness-fu", "Travis", { :token => 'travistoken' }).should == true
+      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
     end
   end
@@ -37,7 +37,7 @@ describe Octokit::Client::PubSubHubbub::ServiceHooks do
         with(unsubscribe_request_body).
         to_return(:body => nil)
 
-      client.unsubscribe_service_hook("joshk/completeness-fu", "Travis").should == true
+      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
     end
   end

data/spec/octokit/client/pub_sub_hubbub_spec.rb

@@ -14,7 +14,7 @@ describe Octokit::Client::PubSubHubbub do
         }).
         to_return(:body => nil)
 
-      client.subscribe("https://github.com/joshk/completeness-fu/events/push", "github://Travis?token=travistoken").should == true
+      expect(client.subscribe("https://github.com/joshk/completeness-fu/events/push", "github://Travis?token=travistoken")).to eq(true)
     end
 
     it "raises an error if the topic is not recognized" do
@@ -26,9 +26,9 @@ describe Octokit::Client::PubSubHubbub do
         }).
         to_return(:status => 422)
 
-      proc {
+      expect {
         client.subscribe("https://github.com/joshk/completeness-fud/events/push", "github://Travis?token=travistoken")
-      }.should raise_exception
+      }.to raise_exception
     end
   end
 
@@ -42,7 +42,7 @@ describe Octokit::Client::PubSubHubbub do
       }).
       to_return(:body => nil)
 
-      client.unsubscribe("https://github.com/joshk/completeness-fu/events/push", "github://Travis?token=travistoken").should == true
+      expect(client.unsubscribe("https://github.com/joshk/completeness-fu/events/push", "github://Travis?token=travistoken")).to eq(true)
     end
   end