octokit 1.17.0 → 1.17.1

data/spec/octokit/client/pulls_spec.rb

@@ -9,105 +9,105 @@ describe Octokit::Client::Pulls do
 
   describe ".create_pull_request" do
 
-    it "should create a pull request" do
+    it "creates a pull request" do
       stub_post("https://api.github.com/repos/pengwynn/octokit/pulls").
         with(:pull => {:base => "master", :head => "pengwynn:master", :title => "Title", :body => "Body"}).
         to_return(:body => fixture("v3/pull_created.json"))
       pull = @client.create_pull_request("pengwynn/octokit", "master", "pengwynn:master", "Title", "Body")
-      pull.number.should == 15
-      pull.title.should == "Pull this awesome v3 stuff"
+      expect(pull.number).to eq(15)
+      expect(pull.title).to eq("Pull this awesome v3 stuff")
     end
 
   end
 
   describe ".create_pull_request_for_issue" do
 
-    it "should create a pull request and attach it to an existing issue" do
+    it "creates a pull request and attach it to an existing issue" do
       stub_post("https://api.github.com/repos/pengwynn/octokit/pulls").
         with(:pull => {:base => "master", :head => "pengwynn:octokit", :issue => "15"}).
         to_return(:body => fixture("v3/pull_created.json"))
       pull = @client.create_pull_request_for_issue("pengwynn/octokit", "master", "pengwynn:octokit", "15")
-      pull.number.should == 15
+      expect(pull.number).to eq(15)
     end
 
   end
 
   describe ".pull_requests" do
 
-    it "should return all pull requests" do
+    it "returns all pull requests" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls?state=open").
         to_return(:body => fixture("v3/pull_requests.json"))
       pulls = @client.pulls("pengwynn/octokit")
-      pulls.first.number.should == 928
+      expect(pulls.first.number).to eq(928)
     end
 
   end
 
   describe ".pull_request" do
 
-    it "should return a pull request" do
+    it "returns a pull request" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67").
         to_return(:body => fixture("v3/pull_request.json"))
       pull = @client.pull("pengwynn/octokit", 67)
-      pull.number.should == 67
+      expect(pull.number).to eq(67)
     end
 
   end
 
   describe ".pull_request_commits" do
 
-    it "should return the commits for a pull request" do
+    it "returns the commits for a pull request" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67/commits").
         to_return(:body => fixture("v3/pull_request_commits.json"))
       commits = @client.pull_commits("pengwynn/octokit", 67)
-      commits.first["sha"].should == "2097821c7c5aa4dc02a2cc54d5ca51968b373f95"
+      expect(commits.first["sha"]).to eq("2097821c7c5aa4dc02a2cc54d5ca51968b373f95")
     end
 
   end
 
   describe ".pull_request_comments" do
 
-    it "should return the comments for a pull request" do
+    it "returns the comments for a pull request" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67/comments").
         to_return(:body => fixture("v3/pull_request_comments.json"))
       commits = @client.pull_comments("pengwynn/octokit", 67)
-      commits.first["id"].should == 401530
+      expect(commits.first["id"]).to eq(401530)
     end
 
   end
 
   describe ".merge_pull_request" do
 
-    it "should merge the pull request" do
+    it "merges the pull request" do
       stub_put("https://api.github.com/repos/pengwynn/octokit/pulls/67/merge").
         to_return(:body => fixture("v3/pull_request_merged.json"))
       response = @client.merge_pull_request("pengwynn/octokit", 67)
-      response["sha"].should == "2097821c7c5aa4dc02a2cc54d5ca51968b373f95"
+      expect(response["sha"]).to eq("2097821c7c5aa4dc02a2cc54d5ca51968b373f95")
     end
 
   end
 
   describe ".pull_request_files" do
 
-    it "should list files for a pull request" do
+    it "lists files for a pull request" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/142/files").
         to_return(:body => fixture("v3/pull_request_files.json"))
 
       files = @client.pull_request_files("pengwynn/octokit", 142)
       file = files.first
-      file.filename.should == 'README.md'
-      file.additions.should == 28
+      expect(file.filename).to eq('README.md')
+      expect(file.additions).to eq(28)
     end
 
   end
 
   describe ".pull_merged?" do
 
-    it "should see if the pull request has been merged" do
+    it "returns whether the pull request has been merged" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67/merged").
         to_return(:status => 204)
       merged = @client.pull_merged?("pengwynn/octokit", 67)
-      merged.should be_true
+      expect(merged).to be_true
     end
   end
 

data/spec/octokit/client/refs_spec.rb

@@ -9,68 +9,68 @@ describe Octokit::Client::Refs do
 
   describe ".refs" do
 
-    it "should return all refs" do
+    it "returns all refs" do
       stub_get("/repos/sferik/rails_admin/git/refs/").
         to_return(:body => fixture("v3/refs.json"))
       refs = @client.refs("sferik/rails_admin")
-      refs.first.ref.should == "refs/heads/actions"
+      expect(refs.first.ref).to eq("refs/heads/actions")
     end
 
-    it "should return all tag refs" do
+    it "returns all tag refs" do
       stub_get("/repos/sferik/rails_admin/git/refs/tags").
         to_return(:body => fixture("v3/refs_tags.json"))
       refs = @client.refs("sferik/rails_admin","tags")
-      refs.first.ref.should == "refs/tags/v0.0.1"
+      expect(refs.first.ref).to eq("refs/tags/v0.0.1")
     end
 
   end
 
   describe ".ref" do
 
-    it "should return the tags/v0.0.3 ref" do
+    it "returns the tags/v0.0.3 ref" do
       stub_get("/repos/sferik/rails_admin/git/refs/tags/v0.0.3").
         to_return(:body => fixture("v3/ref.json"))
       ref = @client.ref("sferik/rails_admin","tags/v0.0.3")
-      ref.object.type.should eq("tag")
-      ref.ref.should eq("refs/tags/v0.0.3")
-      ref.url.should eq("https://api.github.com/repos/sferik/rails_admin/git/refs/tags/v0.0.3")
+      expect(ref.object.type).to eq("tag")
+      expect(ref.ref).to eq("refs/tags/v0.0.3")
+      expect(ref.url).to eq("https://api.github.com/repos/sferik/rails_admin/git/refs/tags/v0.0.3")
     end
 
   end
 
   describe ".create_ref" do
 
-    it "should create a ref" do
+    it "creates a ref" do
       stub_post("/repos/octocat/Hello-World/git/refs").
         with(:body => { "ref" => "refs/heads/master", "sha" => "827efc6d56897b048c772eb4087f854f46256132" },
              :headers => {'Content-Type'=>'application/json'}).
         to_return(:body => fixture("v3/ref_create.json"))
       ref = @client.create_ref("octocat/Hello-World","heads/master", "827efc6d56897b048c772eb4087f854f46256132")
-      ref.first.ref.should eq("refs/heads/master")
+      expect(ref.first.ref).to eq("refs/heads/master")
     end
 
   end
 
   describe ".update_ref" do
 
-    it "should update a ref" do
+    it "updates a ref" do
       stub_patch("/repos/octocat/Hello-World/git/refs/heads/sc/featureA").
         with(:body => { "sha" => "aa218f56b14c9653891f9e74264a383fa43fefbd", "force" => true },
              :headers => {'Content-Type'=>'application/json'}).
         to_return(:body => fixture("v3/ref_update.json"))
       refs = @client.update_ref("octocat/Hello-World","heads/sc/featureA", "aa218f56b14c9653891f9e74264a383fa43fefbd", true)
-      refs.first.ref.should eq("refs/heads/sc/featureA")
-      refs.first.object.sha.should eq("aa218f56b14c9653891f9e74264a383fa43fefbd")
+      expect(refs.first.ref).to eq("refs/heads/sc/featureA")
+      expect(refs.first.object.sha).to eq("aa218f56b14c9653891f9e74264a383fa43fefbd")
     end
   end
 
   describe ".delete_ref" do
 
-    it "should delete an existing ref" do
+    it "deletes an existing ref" do
       stub_delete("/repos/octocat/Hello-World/git/refs/heads/feature-a").
         to_return(:status => 204)
       ref = @client.delete_ref("octocat/Hello-World", "heads/feature-a")
-      ref.status.should == 204
+      expect(ref.status).to eq(204)
     end
 
   end

data/spec/octokit/client/repositories_spec.rb

@@ -9,35 +9,35 @@ describe Octokit::Client::Repositories do
 
   describe ".search_user" do
 
-    it "should return matching repositories" do
+    it "returns matching repositories" do
       stub_get("https://api.github.com/legacy/repos/search/One40Proof").
         to_return(:body => fixture("legacy/repositories.json"))
       repositories = @client.search_repositories("One40Proof")
-      repositories.first.name.should == "One40Proof"
+      expect(repositories.first.name).to eq("One40Proof")
     end
 
   end
 
   describe ".repository" do
 
-    it "should return the matching repository" do
+    it "returns the matching repository" do
       stub_get("/repos/sferik/rails_admin").
         to_return(:body => fixture("v3/repository.json"))
       repository = @client.repository("sferik/rails_admin")
-      repository.name.should == "rails_admin"
+      expect(repository.name).to eq("rails_admin")
     end
 
   end
 
   describe ".update_repository" do
 
-    it "should update the matching repository" do
+    it "updates the matching repository" do
       description = "RailsAdmin is a Rails 3 engine that provides an easy-to-use interface for managing your data"
       stub_patch("/repos/sferik/rails_admin").
         with(:body => {:description => description}).
         to_return(:body => fixture("v3/repository.json"))
       repository = @client.edit_repository("sferik/rails_admin", :description => description)
-      repository.description.should == description
+      expect(repository.description).to eq(description)
     end
 
   end
@@ -46,22 +46,22 @@ describe Octokit::Client::Repositories do
 
     context "with a username passed" do
 
-      it "should return user's repositories" do
+      it "returns user's repositories" do
         stub_get("/users/sferik/repos").
           to_return(:body => fixture("v3/repositories.json"))
         repositories = @client.repositories("sferik")
-        repositories.first.name.should == "merb-admin"
+        expect(repositories.first.name).to eq("merb-admin")
       end
 
     end
 
     context "without a username passed" do
 
-      it "should return authenticated user's repositories" do
+      it "returns authenticated user's repositories" do
         stub_get("/user/repos").
           to_return(:body => fixture("v3/repositories.json"))
         repositories = @client.repositories
-        repositories.first.name.should == "merb-admin"
+        expect(repositories.first.name).to eq("merb-admin")
       end
 
     end
@@ -70,186 +70,186 @@ describe Octokit::Client::Repositories do
 
   describe ".star" do
 
-    it "should star a repository" do
+    it "stars a repository" do
       stub_put("/user/starred/sferik/rails_admin").
         to_return(:status => 204)
-      @client.star("sferik/rails_admin").should be_true
+      expect(@client.star("sferik/rails_admin")).to be_true
     end
 
   end
 
   describe ".unstar" do
 
-    it "should unstar a repository" do
+    it "unstars a repository" do
       stub_delete("/user/starred/sferik/rails_admin").
         to_return(:status => 204)
-      @client.unstar("sferik/rails_admin").should be_true
+      expect(@client.unstar("sferik/rails_admin")).to be_true
     end
 
   end
 
   describe ".watch" do
 
-    it "should watch a repository" do
+    it "watches a repository" do
       stub_put("/user/watched/sferik/rails_admin").
         to_return(:status => 204)
-      @client.watch("sferik/rails_admin").should be_true
+      expect(@client.watch("sferik/rails_admin")).to be_true
     end
 
   end
 
   describe ".unwatch" do
 
-    it "should unwatch a repository" do
+    it "unwatches a repository" do
       stub_delete("/user/watched/sferik/rails_admin").
         to_return(:status => 204)
-      @client.unwatch("sferik/rails_admin").should be_true
+      expect(@client.unwatch("sferik/rails_admin")).to be_true
     end
 
   end
 
   describe ".fork" do
 
-    it "should fork a repository" do
+    it "forks a repository" do
       stub_post("/repos/sferik/rails_admin/forks").
         to_return(:body => fixture("v3/repository.json"))
       repository = @client.fork("sferik/rails_admin")
-      repository.name.should == "rails_admin"
+      expect(repository.name).to eq("rails_admin")
     end
 
   end
 
   describe ".create_repository" do
 
-    it "should create a repository" do
+    it "creates a repository" do
       stub_post("/user/repos").
         with(:name => "rails_admin").
         to_return(:body => fixture("v3/repository.json"))
       repository = @client.create_repository("rails_admin")
-      repository.name.should == "rails_admin"
+      expect(repository.name).to eq("rails_admin")
     end
 
-    it "should create a repository for an organization" do
+    it "creates a repository for an organization" do
       stub_post("/orgs/comorichwebgroup/repos").
         with(:name => "demo").
         to_return(:body => fixture("v3/organization-repository.json"))
       repository = @client.create_repository("demo", {:organization => 'comorichwebgroup'})
-      repository.name.should == "demo"
-      repository.organization.login.should == "CoMoRichWebGroup"
+      expect(repository.name).to eq("demo")
+      expect(repository.organization.login).to eq("CoMoRichWebGroup")
     end
 
   end
 
   describe ".delete_repository" do
 
-    it "should delete a repository" do
+    it "deletes a repository" do
       stub_delete("/repos/sferik/rails_admin").
         to_return(:status => 204, :body => "")
       result = @client.delete_repository("sferik/rails_admin")
-      result.should be_true
+      expect(result).to be_true
     end
 
   end
 
   describe ".set_private" do
 
-    it "should set a repository private" do
+    it "sets a repository private" do
       stub_patch("/repos/sferik/rails_admin").
         with({ :name => "rails_admin", :private => false }).
         to_return(:body => fixture("v3/repository.json"))
       repository = @client.set_private("sferik/rails_admin")
-      repository.name.should == "rails_admin"
+      expect(repository.name).to eq("rails_admin")
     end
 
   end
 
   describe ".set_public" do
 
-    it "should set a repository public" do
+    it "sets a repository public" do
       stub_patch("/repos/sferik/rails_admin").
         with({ :name => "rails_admin", :private => true }).
         to_return(:body => fixture("v3/repository.json"))
       repository = @client.set_public("sferik/rails_admin")
-      repository.name.should == "rails_admin"
-      repository.private.should == false
+      expect(repository.name).to eq("rails_admin")
+      expect(repository.private).to eq(false)
     end
 
   end
 
   describe ".deploy_keys" do
 
-    it "should return a repository's deploy keys" do
+    it "returns a repository's deploy keys" do
       stub_get("/repos/sferik/rails_admin/keys").
         to_return(:body => fixture("v3/public_keys.json"))
       public_keys = @client.deploy_keys("sferik/rails_admin")
-      public_keys.first.id.should == 103205
+      expect(public_keys.first.id).to eq(103205)
     end
 
   end
 
   describe ".add_deploy_key" do
 
-    it "should add a repository deploy keys" do
+    it "adds a repository deploy keys" do
       stub_post("/repos/sferik/rails_admin/keys").
         with(:body => { :title => "Moss", :key => "ssh-dss AAAAB3NzaC1kc3MAAACBAJz7HanBa18ad1YsdFzHO5Wy1/WgXd4BV+czbKq7q23jungbfjN3eo2a0SVdxux8GG+RZ9ia90VD/X+PE4s3LV60oXZ7PDAuyPO1CTF0TaDoKf9mPaHcPa6agMJVocMsgBgwviWT1Q9VgN1SccDsYVDtxkIAwuw25YeHZlG6myx1AAAAFQCgW+OvXWUdUJPBGkRJ8ML7uf0VHQAAAIAlP5G96tTss0SKYVSCJCyocn9cyGQdNjxah4/aYuYFTbLI1rxk7sr/AkZfJNIoF2UFyO5STbbratykIQGUPdUBg1a2t72bu31x+4ZYJMngNsG/AkZ2oqLiH6dJKHD7PFx2oSPalogwsUV7iSMIZIYaPa03A9763iFsN0qJjaed+gAAAIBxz3Prxdzt/os4XGXSMNoWcS03AFC/05NOkoDMrXxQnTTpp1wrOgyRqEnKz15qC5dWk1ynzK+LJXHDZGA8lXPfCjHpJO3zrlZ/ivvLhgPdDpt13MAhIJFH06hTal0woxbk/fIdY71P3kbgXC0Ppx/0S7BC+VxqRCA4/wcM+BoDbA== host" }).
         to_return(:body => fixture("v3/public_key.json"))
       public_key = @client.add_deploy_key("sferik/rails_admin", "Moss", "ssh-dss AAAAB3NzaC1kc3MAAACBAJz7HanBa18ad1YsdFzHO5Wy1/WgXd4BV+czbKq7q23jungbfjN3eo2a0SVdxux8GG+RZ9ia90VD/X+PE4s3LV60oXZ7PDAuyPO1CTF0TaDoKf9mPaHcPa6agMJVocMsgBgwviWT1Q9VgN1SccDsYVDtxkIAwuw25YeHZlG6myx1AAAAFQCgW+OvXWUdUJPBGkRJ8ML7uf0VHQAAAIAlP5G96tTss0SKYVSCJCyocn9cyGQdNjxah4/aYuYFTbLI1rxk7sr/AkZfJNIoF2UFyO5STbbratykIQGUPdUBg1a2t72bu31x+4ZYJMngNsG/AkZ2oqLiH6dJKHD7PFx2oSPalogwsUV7iSMIZIYaPa03A9763iFsN0qJjaed+gAAAIBxz3Prxdzt/os4XGXSMNoWcS03AFC/05NOkoDMrXxQnTTpp1wrOgyRqEnKz15qC5dWk1ynzK+LJXHDZGA8lXPfCjHpJO3zrlZ/ivvLhgPdDpt13MAhIJFH06hTal0woxbk/fIdY71P3kbgXC0Ppx/0S7BC+VxqRCA4/wcM+BoDbA== host")
-      public_key.id.should == 103205
+      expect(public_key.id).to eq(103205)
     end
 
   end
 
   describe ".remove_deploy_key" do
 
-    it "should remove a repository deploy keys" do
+    it "removes a repository deploy keys" do
       stub_delete("/repos/sferik/rails_admin/keys/#{103205}").
         to_return(:status => 204)
       result = @client.remove_deploy_key("sferik/rails_admin", 103205)
-      result.should be_nil
+      expect(result).to be_nil
     end
 
   end
 
   describe ".collaborators" do
 
-    it "should return a repository's collaborators" do
+    it "returns a repository's collaborators" do
       stub_get("/repos/sferik/rails_admin/collaborators").
         to_return(:body => fixture("v3/collaborators.json"))
       collaborators = @client.collaborators("sferik/rails_admin")
-      collaborators.first.login.should == "sferik"
+      expect(collaborators.first.login).to eq("sferik")
     end
 
   end
 
   describe ".add_collaborator" do
 
-    it "should add a repository collaborators" do
+    it "adds a repository collaborators" do
       stub_put("/repos/sferik/rails_admin/collaborators/sferik").
         to_return(:status => 204)
       result = @client.add_collaborator("sferik/rails_admin", "sferik")
-      result.should be_nil
+      expect(result).to be_nil
     end
 
   end
 
   describe ".remove_collaborator" do
 
-    it "should remove a repository collaborators" do
+    it "removes a repository collaborators" do
       stub_delete("/repos/sferik/rails_admin/collaborators/sferik").
         to_return(:status => 204)
       result = @client.remove_collaborator("sferik/rails_admin", "sferik")
-      result.should be_nil
+      expect(result).to be_nil
     end
 
   end
 
   describe ".repository_teams" do
 
-    it "should return all repository teams" do
+    it "returns all repository teams" do
       stub_get("/repos/codeforamerica/open311/teams").
         to_return(:body => fixture("v3/teams.json"))
       teams = @client.repository_teams("codeforamerica/open311")
-      teams.first.name.should == "Fellows"
+      expect(teams.first.name).to eq("Fellows")
     end
 
   end
@@ -258,22 +258,22 @@ describe Octokit::Client::Repositories do
 
     context "with anonymous users" do
 
-      it "should return all repository contributors" do
+      it "returns all repository contributors" do
         stub_get("/repos/sferik/rails_admin/contributors?anon=true").
           to_return(:body => fixture("v3/contributors.json"))
         contributors = @client.contributors("sferik/rails_admin", true)
-        contributors.first.login.should == "sferik"
+        expect(contributors.first.login).to eq("sferik")
       end
 
     end
 
     context "without anonymous users" do
 
-      it "should return all repository contributors" do
+      it "returns all repository contributors" do
         stub_get("/repos/sferik/rails_admin/contributors?anon=false").
           to_return(:body => fixture("v3/contributors.json"))
         contributors = @client.contributors("sferik/rails_admin")
-        contributors.first.login.should == "sferik"
+        expect(contributors.first.login).to eq("sferik")
       end
 
     end
@@ -282,167 +282,167 @@ describe Octokit::Client::Repositories do
 
   describe ".stargazers" do
 
-    it "should return all repository stargazers" do
+    it "returns all repository stargazers" do
       stub_get("/repos/sferik/rails_admin/stargazers").
         to_return(:body => fixture("v3/stargazers.json"))
       stargazers = @client.stargazers("sferik/rails_admin")
-      stargazers.first.login.should == "sferik"
+      expect(stargazers.first.login).to eq("sferik")
     end
 
   end
 
   describe ".watchers" do
 
-    it "should return all repository watchers" do
+    it "returns all repository watchers" do
       stub_get("/repos/sferik/rails_admin/watchers").
         to_return(:body => fixture("v3/watchers.json"))
       watchers = @client.watchers("sferik/rails_admin")
-      watchers.first.login.should == "sferik"
+      expect(watchers.first.login).to eq("sferik")
     end
 
   end
 
   describe ".network" do
 
-    it "should return a repository's network" do
+    it "returns a repository's network" do
       stub_get("/repos/sferik/rails_admin/forks").
         to_return(:body => fixture("v3/forks.json"))
       network = @client.network("sferik/rails_admin")
-      network.first.owner.login.should == "digx"
+      expect(network.first.owner.login).to eq("digx")
     end
 
   end
 
   describe ".languages" do
 
-    it "should return a repository's languages" do
+    it "returns a repository's languages" do
       stub_get("/repos/sferik/rails_admin/languages").
         to_return(:body => fixture("v3/languages.json"))
       languages = @client.languages("sferik/rails_admin")
-      languages["Ruby"].should == 345701
+      expect(languages["Ruby"]).to eq(345701)
     end
 
   end
 
   describe ".tags" do
 
-    it "should return a repository's tags" do
+    it "returns a repository's tags" do
       stub_get("/repos/pengwynn/octokit/tags").
         to_return(:body => fixture("v3/tags.json"))
       tags = @client.tags("pengwynn/octokit")
       v0_6_4 = tags.find { |tag| tag.name == "v0.6.4" }
-      v0_6_4.commit.sha.should == "09bcc30e7286eeb1bbde68d0ace7a6b90b1a84a2"
+      expect(v0_6_4.commit.sha).to eq("09bcc30e7286eeb1bbde68d0ace7a6b90b1a84a2")
     end
 
   end
 
   describe ".branches" do
 
-    it "should return a repository's branches" do
+    it "returns a repository's branches" do
       stub_get("/repos/pengwynn/octokit/branches").
         to_return(:body => fixture("v3/branches.json"))
       branches = @client.branches("pengwynn/octokit")
       master = branches.find { |branch| branch.name == "master" }
-      master.commit.sha.should == "88553a397f7293b3ba176dc27cd1ab6bb93d5d14"
+      expect(master.commit.sha).to eq("88553a397f7293b3ba176dc27cd1ab6bb93d5d14")
     end
 
-    it "should return a single branch" do
+    it "returns a single branch" do
       branch = JSON.parse(fixture("v3/branches.json").read).last
       stub_get("/repos/pengwynn/octokit/branches/master").
         to_return(:body => branch)
       branch = @client.branch("pengwynn/octokit", "master")
-      branch.commit.sha.should == "88553a397f7293b3ba176dc27cd1ab6bb93d5d14"
+      expect(branch.commit.sha).to eq("88553a397f7293b3ba176dc27cd1ab6bb93d5d14")
     end
 
   end
 
   describe ".hooks" do
 
-    it "should return a repository's hooks" do
+    it "returns a repository's hooks" do
       stub_get("/repos/railsbp/railsbp.com/hooks").
         to_return(:body => fixture("v3/hooks.json"))
       hooks = @client.hooks("railsbp/railsbp.com")
       hook = hooks.find { |hook| hook.name == "railsbp" }
-      hook.config.token.should == "xAAQZtJhYHGagsed1kYR"
+      expect(hook.config.token).to eq("xAAQZtJhYHGagsed1kYR")
     end
 
   end
 
   describe ".hook" do
 
-    it "should return a repository's single hook" do
+    it "returns a repository's single hook" do
       stub_get("/repos/railsbp/railsbp.com/hooks/154284").
         to_return(:body => fixture("v3/hook.json"))
       hook = @client.hook("railsbp/railsbp.com", 154284)
-      hook.config.token.should == "xAAQZtJhYHGagsed1kYR"
+      expect(hook.config.token).to eq("xAAQZtJhYHGagsed1kYR")
     end
 
   end
 
   describe ".create_hook" do
 
-    it "should create a hook" do
+    it "creates a hook" do
       stub_post("/repos/railsbp/railsbp.com/hooks").
         with(:body => {:name => "railsbp", :config => {:railsbp_url => "http://railsbp.com", :token => "xAAQZtJhYHGagsed1kYR"}, :events => ["push"], :active => true}).
         to_return(:body => fixture("v3/hook.json"))
       hook = @client.create_hook("railsbp/railsbp.com", "railsbp", {:railsbp_url => "http://railsbp.com", :token => "xAAQZtJhYHGagsed1kYR"})
-      hook.id.should == 154284
+      expect(hook.id).to eq(154284)
     end
 
   end
 
   describe ".edit_hook" do
 
-    it "should edit a hook" do
+    it "edits a hook" do
       stub_patch("/repos/railsbp/railsbp.com/hooks/154284").
         with(:body => {:name => "railsbp", :config => {:railsbp_url => "http://railsbp.com", :token => "xAAQZtJhYHGagsed1kYR"}, :events => ["push"], :active => true}).
         to_return(:body => fixture("v3/hook.json"))
       hook = @client.edit_hook("railsbp/railsbp.com", 154284, "railsbp", {:railsbp_url => "http://railsbp.com", :token => "xAAQZtJhYHGagsed1kYR"})
-      hook.id.should == 154284
-      hook.config.token.should == "xAAQZtJhYHGagsed1kYR"
+      expect(hook.id).to eq(154284)
+      expect(hook.config.token).to eq("xAAQZtJhYHGagsed1kYR")
     end
 
   end
 
   describe ".remove_hook" do
 
-    it "should remove a hook" do
+    it "removes a hook" do
       stub_delete("/repos/railsbp/railsbp.com/hooks/154284").
         to_return(:status => 204)
-      @client.remove_hook("railsbp/railsbp.com", 154284).should be_nil
+      expect(@client.remove_hook("railsbp/railsbp.com", 154284)).to be_nil
     end
 
   end
 
   describe ".test_hook" do
 
-    it "should test a hook" do
+    it "tests a hook" do
       stub_post("/repos/railsbp/railsbp.com/hooks/154284/test").
         to_return(:status => 204)
-      @client.test_hook("railsbp/railsbp.com", 154284).should be_nil
+      expect(@client.test_hook("railsbp/railsbp.com", 154284)).to be_nil
     end
 
   end
 
   describe ".events" do
 
-    it "should list event for all issues in a repository" do
+    it "lists events for all issues in a repository" do
       stub_get("/repos/pengwynn/octokit/issues/events").
       to_return(:body => fixture("v3/repo_issues_events.json"))
       events = @client.repo_issue_events("pengwynn/octokit")
-      events.first.actor.login.should == "ctshryock"
-      events.first.event.should == "subscribed"
+      expect(events.first.actor.login).to eq("ctshryock")
+      expect(events.first.event).to eq("subscribed")
     end
 
   end
 
   describe ".assignees" do
 
-    it "should list all the available assignees (owner + collaborators)" do
+    it "lists all the available assignees (owner + collaborators)" do
       stub_get("/repos/pengwynn/octokit/assignees").
       to_return(:body => fixture("v3/repo_assignees.json"))
-      assignees = @client.repo_assignees("pengwynn/octokit") 
-      assignees.first.login.should == "adamstac"
+      assignees = @client.repo_assignees("pengwynn/octokit")
+      expect(assignees.first.login).to eq("adamstac")
     end
 
   end