octokit 1.17.0 → 1.17.1

data/spec/octokit/client/statuses_spec.rb

@@ -7,27 +7,27 @@ describe Octokit::Client::Statuses do
     @client = Octokit::Client.new(:login => 'sferik')
   end
 
-  describe '.statuses' do
+  describe ".statuses" do
 
-    it 'should list commit statuses' do
+    it "lists commit statuses" do
       stub_get('https://api.github.com/repos/pengwynn/octokit/statuses/7d069dedd4cb56bf57760688657abd0e6b5a28b8').
         to_return(:body => fixture('v3/statuses.json'))
       statuses = @client.statuses('pengwynn/octokit', '7d069dedd4cb56bf57760688657abd0e6b5a28b8')
-      statuses.first.target_url.should == 'http://travis-ci.org/pengwynn/octokit/builds/2092930'
+      expect(statuses.first.target_url).to eq('http://travis-ci.org/pengwynn/octokit/builds/2092930')
     end
 
   end
 
-  describe '.create_status' do
+  describe ".create_status" do
 
-    it 'should create status' do
+    it "creates status" do
       stub_post('https://api.github.com/repos/pengwynn/octokit/statuses/7d069dedd4cb56bf57760688657abd0e6b5a28b8').
         to_return(:body => fixture('v3/status.json'))
       info = {
         :target_url => 'http://wynnnetherland.com'
       }
       status = @client.create_status('pengwynn/octokit', '7d069dedd4cb56bf57760688657abd0e6b5a28b8', 'success', info)
-      status.target_url.should == 'http://wynnnetherland.com'
+      expect(status.target_url).to eq('http://wynnnetherland.com')
     end
 
   end

data/spec/octokit/client/users_spec.rb

@@ -11,11 +11,11 @@ describe Octokit::Client::Users do
 
     context "with a username passed" do
 
-      it "should return matching username" do
+      it "returns matching username" do
         stub_get("https://api.github.com/legacy/user/search/sferik").
           to_return(:body => fixture("legacy/users.json"))
         users = @client.search_users("sferik")
-        users.first.username.should == "sferik"
+        expect(users.first.username).to eq("sferik")
       end
 
     end
@@ -26,22 +26,22 @@ describe Octokit::Client::Users do
 
     context "with a username passed" do
 
-      it "should return the user" do
+      it "returns the user" do
         stub_get("/users/sferik").
           to_return(:body => fixture("v3/user.json"))
         user = @client.user("sferik")
-        user.login.should == "sferik"
+        expect(user.login).to eq("sferik")
       end
 
     end
 
     context "without a username passed" do
 
-      it "should return the authenticated user" do
+      it "returns the authenticated user" do
         stub_get("/user").
           to_return(:body => fixture("v3/user.json"))
         user = @client.user
-        user.login.should == "sferik"
+        expect(user.login).to eq("sferik")
       end
 
     end
@@ -52,12 +52,12 @@ describe Octokit::Client::Users do
 
     context "with a location passed" do
 
-      it "should update the user's location" do
+      it "updates the user's location" do
         stub_patch("/user").
           with(:body => {:name => "Erik Michaels-Ober", :email => "sferik@gmail.com", :company => "Code for America", :location => "San Francisco", :hireable => false}).
           to_return(:body => fixture("v3/user.json"))
         user = @client.update_user(:name => "Erik Michaels-Ober", :email => "sferik@gmail.com", :company => "Code for America", :location => "San Francisco", :hireable => false)
-        user.login.should == "sferik"
+        expect(user.login).to eq("sferik")
       end
 
     end
@@ -68,22 +68,22 @@ describe Octokit::Client::Users do
 
     context "with a username passed" do
 
-      it "should return the user's followers" do
+      it "returns the user's followers" do
         stub_get("https://api.github.com/users/sferik/followers").
           to_return(:body => fixture("v3/followers.json"))
         users = @client.followers("sferik")
-        users.first.login.should == "puls"
+        expect(users.first.login).to eq("puls")
       end
 
     end
 
     context "without a username passed" do
 
-      it "should return the user's followers" do
+      it "returns the user's followers" do
         stub_get("https://api.github.com/users/sferik/followers").
           to_return(:body => fixture("v3/followers.json"))
         users = @client.followers
-        users.first.login.should == "puls"
+        expect(users.first.login).to eq("puls")
       end
 
     end
@@ -94,22 +94,22 @@ describe Octokit::Client::Users do
 
     context "with a username passed" do
 
-      it "should return the user's following" do
+      it "returns the user's following" do
         stub_get("https://api.github.com/users/sferik/following").
           to_return(:body => fixture("v3/following.json"))
         users = @client.following("sferik")
-        users.first.login.should == "rails"
+        expect(users.first.login).to eq("rails")
       end
 
     end
 
     context "without a username passed" do
 
-      it "should return the user's following" do
+      it "returns the user's following" do
         stub_get("https://api.github.com/users/sferik/following").
           to_return(:body => fixture("v3/following.json"))
         users = @client.following
-        users.first.login.should == "rails"
+        expect(users.first.login).to eq("rails")
       end
 
     end
@@ -120,22 +120,22 @@ describe Octokit::Client::Users do
 
     context "with one user following another" do
 
-      it "should return true" do
+      it "returns true" do
         stub_get("https://api.github.com/user/following/puls").
           to_return(:status => 204, :body => "")
         follows = @client.follows?("sferik", "puls")
-        follows.should be_true
+        expect(follows).to be_true
       end
 
     end
 
     context "with one user not following another" do
 
-      it "should return false" do
+      it "returns false" do
         stub_get("https://api.github.com/user/following/dogbrainz").
           to_return(:status => 404, :body => "")
         follows = @client.follows?("sferik", "dogbrainz")
-        follows.should be_false
+        expect(follows).to be_false
       end
 
     end
@@ -144,22 +144,22 @@ describe Octokit::Client::Users do
 
   describe ".follow" do
 
-    it "should follow a user" do
+    it "follows a user" do
       stub_put("https://api.github.com/user/following/dianakimball").
         to_return(:status => 204, :body => "")
       following = @client.follow("dianakimball")
-      following.should be_true
+      expect(following).to be_true
     end
 
   end
 
   describe ".unfollow" do
 
-    it "should unfollow a user" do
+    it "unfollows a user" do
       stub_delete("https://api.github.com/user/following/dogbrainz").
         to_return(:status => 204, :body => "")
       following = @client.unfollow("dogbrainz")
-      following.should be_true
+      expect(following).to be_true
     end
 
   end
@@ -168,22 +168,22 @@ describe Octokit::Client::Users do
 
     context "with on user starring a repo" do
 
-      it "should return true" do
+      it "returns true" do
         stub_get("https://api.github.com/user/starred/sferik/rails_admin").
           to_return(:status => 204, :body => "")
         starred = @client.starred?("sferik", "rails_admin")
-        starred.should be_true
+        expect(starred).to be_true
       end
 
     end
 
     context "with on user not starring a repo" do
 
-      it "should return false" do
+      it "returns false" do
         stub_get("https://api.github.com/user/starred/sferik/dogbrainz").
           to_return(:status => 404, :body => "")
         starred = @client.starred?("sferik", "dogbrainz")
-        starred.should be_false
+        expect(starred).to be_false
       end
 
     end
@@ -194,22 +194,22 @@ describe Octokit::Client::Users do
 
     context "with a username passed" do
 
-      it "should return starred repositories" do
+      it "returns starred repositories" do
         stub_get("https://api.github.com/users/sferik/starred").
           to_return(:body => fixture("v3/starred.json"))
         repositories = @client.starred("sferik")
-        repositories.first.name.should == "grit"
+        expect(repositories.first.name).to eq("grit")
       end
 
     end
 
     context "without a username passed" do
 
-      it "should return starred repositories" do
+      it "returns starred repositories" do
         stub_get("https://api.github.com/users/sferik/starred").
           to_return(:body => fixture("v3/starred.json"))
         repositories = @client.starred
-        repositories.first.name.should == "grit"
+        expect(repositories.first.name).to eq("grit")
       end
 
     end
@@ -220,22 +220,22 @@ describe Octokit::Client::Users do
 
     context "with a username passed" do
 
-      it "should return watched repositories" do
+      it "returns watched repositories" do
         stub_get("https://api.github.com/users/sferik/watched").
           to_return(:body => fixture("v3/watched.json"))
         repositories = @client.watched("sferik")
-        repositories.first.name.should == "grit"
+        expect(repositories.first.name).to eq("grit")
       end
 
     end
 
     context "without a username passed" do
 
-      it "should return watched repositories" do
+      it "returns watched repositories" do
         stub_get("https://api.github.com/users/sferik/watched").
           to_return(:body => fixture("v3/watched.json"))
         repositories = @client.watched
-        repositories.first.name.should == "grit"
+        expect(repositories.first.name).to eq("grit")
       end
 
     end
@@ -244,69 +244,69 @@ describe Octokit::Client::Users do
 
   describe ".keys" do
 
-    it "should return public keys" do
+    it "returns public keys" do
       stub_get("https://api.github.com/user/keys").
         to_return(:body => fixture("v3/public_keys.json"))
       public_keys = @client.keys
-      public_keys.first.id.should == 103205
+      expect(public_keys.first.id).to eq(103205)
     end
 
   end
 
   describe ".add_key" do
 
-    it "should add a public key" do
+    it "adds a public key" do
       title, key = "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"
       stub_post("https://api.github.com/user/keys").
         with(:title => title, :key => key).
         to_return(:status => 201, :body => fixture("v3/public_key.json"))
       public_key = @client.add_key(title, key)
-      public_key.id.should == 103205
+      expect(public_key.id).to eq(103205)
     end
 
   end
 
   describe ".remove_key" do
 
-    it "should remove a public key" do
+    it "removes a public key" do
       stub_delete("https://api.github.com/user/keys/103205").
         to_return(:status => 204, :body => "")
       response = @client.remove_key(103205)
-      response.should be_true
+      expect(response).to be_true
     end
 
   end
 
   describe ".emails" do
 
-    it "should return email addresses" do
+    it "returns email addresses" do
       stub_get("https://api.github.com/user/emails").
         to_return(:body => fixture("v3/emails.json"))
       emails = @client.emails
-      emails.first.should == "sferik@gmail.com"
+      expect(emails.first).to eq("sferik@gmail.com")
     end
 
   end
 
   describe ".add_email" do
 
-    it "should add an email address" do
+    it "adds an email address" do
       stub_post("https://api.github.com/user/emails").
         with(:email => "sferik@gmail.com").
         to_return(:body => fixture("v3/emails.json"))
       emails = @client.add_email("sferik@gmail.com")
-      emails.first.should == "sferik@gmail.com"
+      expect(emails.first).to eq("sferik@gmail.com")
     end
 
   end
 
   describe ".remove_email" do
 
-    it "should remove an email address" do
+    it "removes an email address" do
       stub_delete("https://api.github.com/user/emails?email=sferik@gmail.com").
         to_return(:status => 204, :body => "")
       response = @client.remove_email("sferik@gmail.com")
-      response.should be_true
+      expect(response).to be_true
     end
 
   end

data/spec/octokit/client_spec.rb

@@ -1,16 +1,16 @@
 require 'helper'
 
 describe Octokit::Client do
-  it 'should work with basic auth and password' do
+  it "works with basic auth and password" do
     stub_get("https://foo:bar@api.github.com/repos/baz/quux/commits?per_page=35&sha=master").
       with(:headers => {'Accept'=>'*/*'}).
       to_return(:status => 200, :body => '{"commits":[]}', :headers => {})
-    proc {
+    expect {
       Octokit::Client.new(:login => 'foo', :password => 'bar').commits('baz/quux')
-    }.should_not raise_exception
+    }.not_to raise_exception
   end
 
-  it 'should configure faraday from faraday_config_block' do
+  it "configures faraday from faraday_config_block" do
     mw_evaluated = false
     Octokit.configure do |c|
       c.faraday_config { |f| mw_evaluated = true }
@@ -20,13 +20,13 @@ describe Octokit::Client do
                 { 'X-RateLimit-Limit' => 5000, 'X-RateLimit-Remaining' => 5000})
     client = Octokit::Client.new()
     client.rate_limit
-    mw_evaluated.should be_true
+    expect(mw_evaluated).to be_true
   end
 
 
   describe "auto_traversal" do
 
-    it "should traverse a paginated response using the maximum allowed number of items per page" do
+    it "traverses a paginated response using the maximum allowed number of items per page" do
       stub_get("https://api.github.com/foo/bar?per_page=100").
         to_return(:status => 200, :body => %q{["stuff"]}, :headers =>
           { 'Link' => %q{<https://api.github.com/foo/bar?page=2>; rel="next", <https://api.github.com/foo/bar?page=3>; rel="last"} })
@@ -39,10 +39,10 @@ describe Octokit::Client do
         to_return(:status => 200, :body => %q{["stuffapalooza"]}, :headers =>
           { 'Link' => %q{<https://api.github.com/foo/bar?page=2>; rel="prev", <https://api.github.com/foo/bar?page=1>; rel="first"} })
 
-      Octokit::Client.new(:auto_traversal => true).get("https://api.github.com/foo/bar", {}, 3).should == ['stuff', 'even more stuff', 'stuffapalooza']
+      expect(Octokit::Client.new(:auto_traversal => true).get("https://api.github.com/foo/bar", {}, 3)).to eq(['stuff', 'even more stuff', 'stuffapalooza'])
     end
 
-    it "should use the number set in the per_page configuration option when present" do
+    it "uses the number set in the per_page configuration option when present" do
       stub_get("https://api.github.com/foo/bar?per_page=50").
         to_return(:status => 200, :body => %q{["stuff"]}, :headers =>
           { 'Link' => %q{<https://api.github.com/foo/bar?page=2>; rel="next", <https://api.github.com/foo/bar?page=3>; rel="last"} })
@@ -51,7 +51,7 @@ describe Octokit::Client do
         to_return(:status => 200, :body => %q{["even more stuff"]}, :headers =>
           { 'Link' => %q{<https://api.github.com/foo/bar?page=3>; rel="last", <https://api.github.com/foo/bar?page=1>; rel="prev", <https://api.github.com/foo/bar?page=1>; rel="first"} })
 
-      Octokit::Client.new(:auto_traversal => true, :per_page => 50).get("https://api.github.com/foo/bar", {}, 3).should
+      expect(Octokit::Client.new(:auto_traversal => true, :per_page => 50).get("https://api.github.com/foo/bar", {}, 3)).to be
     end
 
   end
@@ -65,12 +65,12 @@ describe Octokit::Client do
       @client = Octokit::Client.new()
     end
 
-    it "should get the ratelimit-limit from the header" do
-      @client.ratelimit.should == 5000
+    it "gets the ratelimit-limit from the header" do
+      expect(@client.ratelimit).to eq(5000)
     end
 
-    it "should get the ratelimit-remaining using header" do
-      @client.ratelimit_remaining.should == 5000
+    it "gets the ratelimit-remaining using header" do
+      expect(@client.ratelimit_remaining).to eq(5000)
     end
 
   end
@@ -91,12 +91,12 @@ describe Octokit::Client do
       Octokit.reset
     end
 
-    it "should get the ratelimit-limit from the header" do
-      @client.ratelimit.should == 62500
+    it "gets the ratelimit-limit from the header" do
+      expect(@client.ratelimit).to eq(62500)
     end
 
-    it "should get the ratelimit-remaining using header" do
-      @client.ratelimit_remaining.should == 62500
+    it "gets the ratelimit-remaining using header" do
+      expect(@client.ratelimit_remaining).to eq(62500)
     end
 
   end
@@ -107,30 +107,30 @@ describe Octokit::Client do
       Octokit.reset
     end
 
-    it "should default to https://api.github.com" do
+    it "defaults to https://api.github.com" do
       client = Octokit::Client.new
-      client.api_endpoint.should == 'https://api.github.com/'
+      expect(client.api_endpoint).to eq('https://api.github.com/')
     end
 
-    it "should be set " do
+    it "is set " do
       Octokit.api_endpoint = 'http://foo.dev'
       client = Octokit::Client.new
-      client.api_endpoint.should == 'http://foo.dev/'
+      expect(client.api_endpoint).to eq('http://foo.dev/')
     end
   end
 
   describe "request_host" do
     after(:each) { Octokit.reset }
 
-    it "should default to nil" do
+    it "defaults to nil" do
       client = Octokit::Client.new
-      client.request_host.should be_nil
+      expect(client.request_host).to be_nil
     end
 
-    it "should be settable" do
+    it "is settable" do
       Octokit.request_host = 'github.company.com'
       client = Octokit::Client.new
-      client.request_host.should == 'github.company.com'
+      expect(client.request_host).to eq('github.company.com')
     end
 
     it "does not change the Host header when not set" do
@@ -139,7 +139,7 @@ describe Octokit::Client do
       stub_request(:any, /.*/)
       req = stub_request(:get, 'http://github.internal/users/me').with(:headers => { 'Host' => /.*/})
       Octokit.user "me"
-      req.should_not have_been_requested
+      expect(req).not_to have_been_requested
     end
 
     it "changes the Host header when set" do
@@ -148,7 +148,7 @@ describe Octokit::Client do
 
       req = stub_request(:get, 'http://github.internal/users/me').with(:headers => { 'Host' => 'github.company.com' })
       Octokit.user "me"
-      req.should have_been_requested
+      expect(req).to have_been_requested
     end
   end