github_api 0.4.6 → 0.4.7

data/spec/github/orgs/teams_spec.rb

@@ -1,10 +1,15 @@
 require 'spec_helper'
 
-describe Github::Orgs::Teams, :type => :base do
-
+describe Github::Orgs::Teams do
+  let(:github) { Github.new }
+  let(:user) { 'peter-murach' }
+  let(:org) { 'github' }
+  let(:repo) { 'github' }
   let(:team)   { 'github' }
   let(:member) { 'github' }
 
+  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
+
   describe "teams" do
     context "resource found" do
       before do
@@ -106,7 +111,6 @@ describe Github::Orgs::Teams, :type => :base do
       before do
         stub_post("/orgs/#{org}/teams").with(inputs).
           to_return(:body => fixture('orgs/team.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should fail to create resource if 'org_name' param is missing" do
@@ -116,7 +120,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should failt to create resource if 'name' input is missing" do
         expect {
           github.orgs.create_team org, inputs.except(:name)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
@@ -139,7 +143,6 @@ describe Github::Orgs::Teams, :type => :base do
       before do
         stub_post("/orgs/#{org}/teams").with(inputs).
           to_return(:body => fixture('orgs/team.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should faile to retrieve resource" do
@@ -167,7 +170,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should failt to create resource if 'name' input is missing" do
         expect {
           github.orgs.edit_team team, inputs.except(:name)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
@@ -190,7 +193,6 @@ describe Github::Orgs::Teams, :type => :base do
       before do
         stub_patch("/teams/#{team}").with(inputs).
           to_return(:body => fixture('orgs/team.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should faile to retrieve resource" do
@@ -290,8 +292,6 @@ describe Github::Orgs::Teams, :type => :base do
 
       context "this repo is being watched by the user"
         before do
-          github.oauth_token = nil
-          github.user = nil
           stub_get("/teams/#{team}/members/#{member}").
             to_return(:body => "", :status => 404, :headers => {:user_agent => github.user_agent})
         end

data/spec/github/orgs_spec.rb

@@ -1,6 +1,14 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-describe Github::Orgs, :type => :base do
+describe Github::Orgs do
+  let(:github) { Github.new }
+  let(:user) { 'peter-murach' }
+  let(:repo) { 'github' }
+  let(:org) { 'github' }
+
+  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
 
   describe "orgs" do
     context "resource found for a user" do
@@ -38,19 +46,18 @@ describe Github::Orgs, :type => :base do
 
     context "resource found for an au user" do
       before do
-        github.user = nil
         github.oauth_token = OAUTH_TOKEN
-        stub_get("/user/orgs?access_token=#{OAUTH_TOKEN}").
+        stub_get("/user/orgs").
+          with(:query => { :access_token => OAUTH_TOKEN }).
           to_return(:body => fixture('orgs/orgs.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
-      after do
-        github.user, github.oauth_token = nil, nil
-      end
+      after { github.oauth_token = nil }
 
       it "should get the resources" do
         github.orgs.orgs
-        a_get("/user/orgs?access_token=#{OAUTH_TOKEN}").should have_been_made
+        a_get("/user/orgs").with(:query => { :access_token => OAUTH_TOKEN }).
+          should have_been_made
       end
     end
 
@@ -111,7 +118,14 @@ describe Github::Orgs, :type => :base do
   end # org
 
   describe "edit_org" do
-    let(:inputs) { { :billing_email => 'support@github.com', :blog => "https://github.com/blog", :company => "GitHub", :email => "support@github.com", :location => "San Francisco", :name => "github" } }
+    let(:inputs) do
+      { :billing_email => 'support@github.com',
+        :blog => "https://github.com/blog",
+        :company => "GitHub",
+        :email => "support@github.com",
+        :location => "San Francisco",
+        :name => "github" }
+    end
 
     context "resource edited successfully" do
       before do

data/spec/github/page_iterator_spec.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Github::PageIterator do
-
   let(:link) {
     "<https://api.github.com/users/wycats/repos?page=4&per_page=20>; rel=\"next\", <https://api.github.com/users/wycats/repos?page=6&per_page=20>; rel=\"last\", <https://api.github.com/users/wycats/repos?page=1&per_page=20>; rel=\"first\", <https://api.github.com/users/wycats/repos?page=2&per_page=20>; rel=\"prev\""
   }

data/spec/github/page_links_spec.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Github::PageLinks do
-
   let(:link) {
     "<https://api.github.com/users/wycats/repos?page=4&per_page=20>; rel=\"next\", <https://api.github.com/users/wycats/repos?page=6&per_page=20>; rel=\"last\", <https://api.github.com/users/wycats/repos?page=1&per_page=20>; rel=\"first\", <https://api.github.com/users/wycats/repos?page=2&per_page=20>; rel=\"prev\""
   }

data/spec/github/paged_request_spec.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Github::PagedRequest do
-
   it { described_class.constants.should include :FIRST_PAGE }
   it { described_class.constants.should include :PER_PAGE }
 

data/spec/github/pull_requests/comments_spec.rb

@@ -1,10 +1,16 @@
-require 'spec_helper'
+# encoding: utf-8
 
-describe Github::PullRequests::Comments, :type => :base do
+require 'spec_helper'
 
+describe Github::PullRequests::Comments do
+  let(:github) { Github.new }
+  let(:user)   { 'peter-murach' }
+  let(:repo) { 'github' }
   let(:pull_request_id) { 1 }
   let(:comment_id) { 1 }
 
+  after { reset_authentication_for github }
+
   describe "#comments" do
     context 'check aliases' do
       it { github.pull_requests.should respond_to :comments }
@@ -260,6 +266,6 @@ describe Github::PullRequests::Comments, :type => :base do
         github.pull_requests.delete_comment user, repo, comment_id
       }.to raise_error(Github::Error::NotFound)
     end
-  end # delete_gist
+  end # delete_comment
 
 end # Github::PullRequests::Comments

data/spec/github/pull_requests_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
-describe Github::PullRequests, :type => :base do
-
+describe Github::PullRequests do
+  let(:github) { Github.new }
+  let(:user)   { 'peter-murach' }
+  let(:repo) { 'github' }
   let(:pull_request_id) { 1 }
 
+  after { reset_authentication_for github }
+
   describe "#pull_requests" do
     context 'check aliases' do
       it { github.pull_requests.should respond_to :pulls }

data/spec/github/repos/collaborators_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
-describe Github::Repos::Collaborators, :type => :base do
+describe Github::Repos::Collaborators do
+  let(:github) { Github.new }
+  let(:user) { 'peter-murach' }
+  let(:repo) { 'github' }
+  let(:collaborator) { 'octocat' }
+
+  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
 
   describe "collaborators" do
     context "resource found" do
@@ -10,7 +16,6 @@ describe Github::Repos::Collaborators, :type => :base do
       end
 
       it "should fail to get resource without username" do
-        github.user, github.repo = nil, nil
         expect { github.repos.collaborators }.to raise_error(ArgumentError)
       end
 
@@ -65,7 +70,7 @@ describe Github::Repos::Collaborators, :type => :base do
 
       it "should fail to get resource without collaborator name" do
         expect {
-          github.repos.collaborator?(user, repo, nil)
+          github.repos.collaborator? user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
@@ -75,7 +80,8 @@ describe Github::Repos::Collaborators, :type => :base do
       end
 
       it "should find collaborator" do
-        github.repos.should_receive(:collaborator?).with(user, repo, collaborator).and_return true
+        github.repos.should_receive(:collaborator?).
+          with(user, repo, collaborator) { true }
         github.repos.collaborator? user, repo, collaborator
       end
     end
@@ -87,14 +93,14 @@ describe Github::Repos::Collaborators, :type => :base do
       end
 
       it "should fail to retrieve resource" do
-        github.repos.should_receive(:collaborator?).with(user, repo, collaborator).and_return false
+        github.repos.should_receive(:collaborator?).
+          with(user, repo, collaborator) { false }
         github.repos.collaborator? user, repo, collaborator
       end
     end
   end # collaborator?
 
   describe "add_collaborator" do
-
     context "resouce added" do
       before do
         stub_put("/repos/#{user}/#{repo}/collaborators/#{collaborator}").
@@ -128,7 +134,6 @@ describe Github::Repos::Collaborators, :type => :base do
   end # add_collaborator
 
   describe "remove_collaborator" do
-
     context "resouce added" do
       before do
         stub_delete("/repos/#{user}/#{repo}/collaborators/#{collaborator}").

data/spec/github/repos/commits_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-describe Github::Repos::Commits, :type => :base do
+describe Github::Repos::Commits do
+  let(:github) { Github.new }
+  let(:user) { 'peter-murach' }
+  let(:repo) { 'github' }
+  after { github.user, github.repo = nil, nil }
 
   describe "commits" do
     context "resource found" do
@@ -10,7 +14,6 @@ describe Github::Repos::Commits, :type => :base do
       end
 
       it "should fail to get resource without username" do
-        github.user, github.repo = nil, nil
         expect { github.repos.commits }.to raise_error(ArgumentError)
       end
 
@@ -84,7 +87,6 @@ describe Github::Repos::Commits, :type => :base do
         commit = github.repos.commit user, repo, sha
         commit.should be_a Hashie::Mash
       end
-
     end
 
     context "resource not found" do
@@ -109,7 +111,6 @@ describe Github::Repos::Commits, :type => :base do
       end
 
       it "should fail to get resource without username" do
-        github.user, github.repo = nil, nil
         expect { github.repos.repo_comments }.to raise_error(ArgumentError)
       end
 
@@ -171,7 +172,8 @@ describe Github::Repos::Commits, :type => :base do
 
       it "should get the resource" do
         github.repos.commit_comments user, repo, sha
-        a_get("/repos/#{user}/#{repo}/commits/#{sha}/comments").should have_been_made
+        a_get("/repos/#{user}/#{repo}/commits/#{sha}/comments").
+          should have_been_made
       end
 
       it "should return array of resources" do
@@ -239,7 +241,6 @@ describe Github::Repos::Commits, :type => :base do
         commit_comment = github.repos.commit_comment user, repo, comment_id
         commit_comment.should be_a Hashie::Mash
       end
-
     end
 
     context "resource not found" do
@@ -258,43 +259,48 @@ describe Github::Repos::Commits, :type => :base do
 
   describe "create_comment" do
     let(:sha) { '23432dfosfsufd' }
-    let(:inputs) { {'body'=> 'web', :commit_id => 1, :line => 1, :path => 'file1.txt', :position => 4 } }
+    let(:inputs) do
+      { 'body' => 'web',
+        :commit_id => 1,
+        :line => 1,
+        :path => 'file1.txt',
+        :position => 4 }
+    end
 
     context "resouce created" do
       before do
         stub_post("/repos/#{user}/#{repo}/commits/#{sha}/comments").with(inputs).
           to_return(:body => fixture('repos/commit_comment.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should fail to create resource if 'body' input is missing" do
         expect {
           github.repos.create_comment user, repo, sha, inputs.except('body')
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should fail to create resource if 'commit_id' input is missing" do
         expect {
           github.repos.create_comment user, repo, sha, inputs.except(:commit_id)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should fail to create resource if 'line' input is missing" do
         expect {
           github.repos.create_comment user, repo, sha, inputs.except(:line)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should fail to create resource if 'path' input is missing" do
         expect {
           github.repos.create_comment user, repo, sha, inputs.except(:path)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should fail to create resource if 'position' input is missing" do
         expect {
           github.repos.create_comment user, repo, sha, inputs.except(:position)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
@@ -383,7 +389,7 @@ describe Github::Repos::Commits, :type => :base do
       it "should fail to create resource if 'body' input is missing" do
         expect {
           github.repos.update_comment user, repo, comment_id, inputs.except('body')
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do

data/spec/github/repos/downloads_spec.rb

@@ -1,6 +1,13 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-describe Github::Repos::Downloads, :type => :base do
+describe Github::Repos::Downloads do
+  let(:github) { Github.new }
+  let(:user) { 'peter-murach' }
+  let(:repo) { 'github' }
+
+  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
 
   it { described_class::VALID_DOWNLOAD_PARAM_NAMES.should_not be_nil }
   it { described_class::REQUIRED_PARAMS.should_not be_nil }
@@ -18,7 +25,6 @@ describe Github::Repos::Downloads, :type => :base do
       end
 
       it "should fail to get resource without username" do
-        github.user, github.repo = nil, nil
         expect { github.repos.downloads }.to raise_error(ArgumentError)
       end
 
@@ -76,7 +82,9 @@ describe Github::Repos::Downloads, :type => :base do
       end
 
       it "should fail to get resource without download id" do
-        expect { github.repos.download(user, repo, nil)}.to raise_error(ArgumentError)
+        expect {
+          github.repos.download(user, repo, nil)
+        }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
@@ -164,13 +172,13 @@ describe Github::Repos::Downloads, :type => :base do
       it "should fail to create resource if 'name' input is missing" do
         expect {
           github.repos.create_download user, repo, inputs.except(:name)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should failt to create resource if 'size' input is missing" do
         expect {
           github.repos.create_download user, repo, inputs.except(:size)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
@@ -193,7 +201,6 @@ describe Github::Repos::Downloads, :type => :base do
       before do
         stub_post("/repos/#{user}/#{repo}/downloads").with(inputs).
           to_return(:body => fixture('repos/download_s3.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should faile to retrieve resource" do
@@ -205,7 +212,12 @@ describe Github::Repos::Downloads, :type => :base do
   end # create_download
 
   describe 'upload' do
-    let(:inputs) { {:name => 'new_file.jpg', :size => 114034, :description => "Latest release", :content_type => 'text/plain'} }
+    let(:inputs) do
+      { :name => 'new_file.jpg',
+        :size => 114034,
+        :description => "Latest release",
+        :content_type => 'text/plain' }
+    end
     let(:resource) { Hashie::Mash.new ::JSON.parse(fixture('repos/download_s3.json').read) }
     let(:file)     { 'filename' }
 
@@ -236,7 +248,6 @@ describe Github::Repos::Downloads, :type => :base do
           github.repos.upload resource, file
         }.to raise_error(Github::Error::NotFound)
       end
-
     end
   end # upload