github_api 0.4.4 → 0.4.5

data/spec/github/orgs/teams_spec.rb

@@ -52,7 +52,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should return 404 with a message 'Not Found'" do
         expect {
           github.orgs.teams org
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # teams
@@ -94,7 +94,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should fail to retrive resource" do
         expect {
           github.orgs.team team
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # team
@@ -145,7 +145,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should faile to retrieve resource" do
         expect {
           github.orgs.create_team org, inputs
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # create_team
@@ -196,7 +196,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should faile to retrieve resource" do
         expect {
           github.orgs.edit_team team, inputs
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # edit_team
@@ -228,7 +228,7 @@ describe Github::Orgs::Teams, :type => :base do
       end
 
       it "should fail to find resource" do
-        expect { github.orgs.delete_team team }.to raise_error(Github::ResourceNotFound)
+        expect { github.orgs.delete_team team }.to raise_error(Github::Error::NotFound)
       end
     end
   end # delete_team
@@ -280,7 +280,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should return 404 with a message 'Not Found'" do
         expect {
           github.orgs.team_members team
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # team_members
@@ -351,7 +351,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should fail to add resource" do
         expect {
           github.orgs.add_team_member team, member
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # add_team_member
@@ -390,7 +390,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should fail to remove resource" do
         expect {
           github.orgs.remove_team_member team, member
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # remove_team_member
@@ -442,7 +442,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should return 404 with a message 'Not Found'" do
         expect {
           github.orgs.team_repos team
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # team_repos
@@ -512,7 +512,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should fail to add resource" do
         expect {
           github.orgs.add_team_repo team, user, repo
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # add_team_repo
@@ -551,7 +551,7 @@ describe Github::Orgs::Teams, :type => :base do
       it "should fail to remove resource" do
         expect {
           github.orgs.remove_team_repo team, user, repo
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # remove_team_repo

data/spec/github/orgs_spec.rb

@@ -63,7 +63,7 @@ describe Github::Orgs, :type => :base do
       it "should return 404 with a message 'Not Found'" do
         expect {
           github.orgs.orgs user
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # orgs
@@ -105,7 +105,7 @@ describe Github::Orgs, :type => :base do
       it "should fail to retrive resource" do
         expect {
           github.orgs.org org
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # org
@@ -148,7 +148,7 @@ describe Github::Orgs, :type => :base do
       it "should fail to find resource" do
         expect {
           github.orgs.edit_org org
-        }.to raise_error(Github::ResourceNotFound)
+        }.to raise_error(Github::Error::NotFound)
       end
     end
   end # edit_org

data/spec/github/pull_requests/comments_spec.rb

@@ -0,0 +1,265 @@
+require 'spec_helper'
+
+describe Github::PullRequests::Comments, :type => :base do
+
+  let(:pull_request_id) { 1 }
+  let(:comment_id) { 1 }
+
+  describe "#comments" do
+    context 'check aliases' do
+      it { github.pull_requests.should respond_to :comments }
+      it { github.pull_requests.should respond_to :request_comments }
+    end
+
+    context 'resource found' do
+
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/comments").
+          to_return(:body => fixture('pull_requests/comments.json'),
+            :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "throws error if comment id not provided" do
+        expect {
+          github.pull_requests.comments user, repo, nil
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should get the resources" do
+        github.pull_requests.comments user, repo, pull_request_id
+        a_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/comments").
+          should have_been_made
+      end
+
+      it "should return array of resources" do
+        comments = github.pull_requests.comments user, repo, pull_request_id
+        comments.should be_an Array
+        comments.should have(1).items
+      end
+
+      it "should be a mash type" do
+        comments = github.pull_requests.comments user, repo, pull_request_id
+        comments.first.should be_a Hashie::Mash
+      end
+
+      it "should get pull request comment information" do
+        comments = github.pull_requests.comments user, repo, pull_request_id
+        comments.first.id.should == pull_request_id
+      end
+
+      it "should yield to a block" do
+        github.pull_requests.should_receive(:comments).
+          with(user, repo, pull_request_id).and_yield('web')
+        github.pull_requests.comments(user, repo, pull_request_id) {|param| 'web' }
+      end
+    end
+
+    context 'resource not found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/comments").
+          to_return(:body => "", :status => [404, "Not Found"])
+      end
+
+      it "should return 404 with a message 'Not Found'" do
+        expect {
+          github.pull_requests.comments user, repo, pull_request_id
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # comments
+
+  describe "#comment" do
+    context 'check aliases' do
+      it { github.pull_requests.should respond_to :comment }
+      it { github.pull_requests.should respond_to :get_comment }
+    end
+
+    context 'resource found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+          to_return(:body => fixture('pull_requests/comment.json'),
+          :status => 200,
+          :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to get resource without comment id" do
+        expect {
+          github.pull_requests.comment user, repo, nil
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should get the resource" do
+        github.pull_requests.comment user, repo, pull_request_id
+        a_get("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+          should have_been_made
+      end
+
+      it "should get comment information" do
+        comment = github.pull_requests.comment user, repo, comment_id
+        comment.id.should eq comment_id
+        comment.user.login.should == 'octocat'
+      end
+
+      it "should return mash" do
+        comment = github.pull_requests.comment user, repo, comment_id
+        comment.should be_a Hashie::Mash
+      end
+    end
+
+    context 'resource not found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+          to_return(:body => fixture('pull_requests/comment.json'),
+            :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to retrive resource" do
+        expect {
+          github.pull_requests.comment user, repo, comment_id
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # comment
+
+  describe "create_request" do
+    let(:inputs) {
+      {
+        "body" => "Nice change",
+        "commit_id" => "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+        "path" => "file1.txt",
+        "position" => 4,
+        "in_reply_to" => 4,
+        'unrelated' => 'giberrish'
+      }
+    }
+
+    context "resouce created" do
+      before do
+        stub_post("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/comments").
+          with(:body => JSON.generate(inputs.except('unrelated'))).
+          to_return(:body => fixture('pull_requests/comment.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it 'raises error when pull_request_id is missing' do
+        expect {
+          github.pull_requests user, repo, nil
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should create resource successfully" do
+        github.pull_requests.create_comment user, repo, pull_request_id, inputs
+        a_post("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/comments").
+          with(inputs).should have_been_made
+      end
+
+      it "should return the resource" do
+        pull_request = github.pull_requests.create_comment user, repo, pull_request_id, inputs
+        pull_request.should be_a Hashie::Mash
+      end
+
+      it "should get the request information" do
+        pull_request = github.pull_requests.create_comment user, repo, pull_request_id, inputs
+        pull_request.id.should == pull_request_id
+      end
+    end
+
+    context "fails to create resource" do
+      before do
+        stub_post("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/comments").
+          with(inputs.except('unrelated')).
+          to_return(:body => fixture('pull_requests/comment.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+
+      end
+
+      it "should faile to retrieve resource" do
+        expect {
+          github.pull_requests.create_comment user, repo, pull_request_id, inputs
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # create_comment
+
+  describe "#edit_comment" do
+    let(:inputs) {
+      {
+        "body" => "Nice change",
+        'unrelated' => 'giberrish'
+      }
+    }
+
+    context "resouce edited" do
+      before do
+        stub_patch("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+          with(:body => JSON.generate(inputs.except('unrelated'))).
+          to_return(:body => fixture('pull_requests/comment.json'),
+                :status => 200,
+                :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should edit resource successfully" do
+        github.pull_requests.edit_comment user, repo, comment_id, inputs
+        a_patch("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+          with(inputs).should have_been_made
+      end
+
+      it "should return the resource" do
+        comment = github.pull_requests.edit_comment user, repo, comment_id, inputs
+        comment.should be_a Hashie::Mash
+      end
+
+      it "should get the comment information" do
+        comment = github.pull_requests.edit_comment user, repo, comment_id, inputs
+        comment.user.login.should == 'octocat'
+      end
+    end
+
+    context "failed to edit resource" do
+      before do
+        stub_patch("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").with(inputs).
+          to_return(:body => fixture('pull_requests/comment.json'),
+            :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to retrieve resource" do
+        expect {
+          github.pull_requests.edit_comment user, repo, comment_id, inputs
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # edit_comment
+
+  context "#delete_comment" do
+    before do
+      stub_delete("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+        to_return(:body => fixture('pull_requests/comment.json'),
+              :status => 204,
+              :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+
+    it 'should raise error if comment_id not present' do
+      expect {
+        github.pull_requests.delete_comment user, repo, nil
+      }.to raise_error(ArgumentError)
+    end
+
+    it "should remove resource successfully" do
+      github.pull_requests.delete_comment user, repo, comment_id
+      a_delete("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+        should have_been_made
+    end
+
+    it "fails to delete resource" do
+      stub_delete("/repos/#{user}/#{repo}/pulls/comments/#{comment_id}").
+        to_return(:body => '',
+          :status => 404,
+          :headers => {:content_type => "application/json; charset=utf-8"})
+      expect {
+        github.pull_requests.delete_comment user, repo, comment_id
+      }.to raise_error(Github::Error::NotFound)
+    end
+  end # delete_gist
+
+end # Github::PullRequests::Comments

data/spec/github/pull_requests_spec.rb

@@ -0,0 +1,414 @@
+require 'spec_helper'
+
+describe Github::PullRequests, :type => :base do
+
+  let(:pull_request_id) { 1 }
+
+  describe "#pull_requests" do
+    context 'check aliases' do
+      it { github.pull_requests.should respond_to :pulls }
+      it { github.pull_requests.should respond_to :requests }
+    end
+
+    context 'resource found' do
+      let(:params) { { :state => 'closed', :unrelated => true } }
+
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls").
+          with(:query => params.except(:unrelated)).
+          to_return(:body => fixture('pull_requests/pull_requests.json'),
+            :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "throws error if pull_request id not provided" do
+        expect { github.pull_requests.pull_requests nil}.to raise_error(ArgumentError)
+      end
+
+      it "should get the resources" do
+        github.pull_requests.pull_requests user, repo, params
+        a_get("/repos/#{user}/#{repo}/pulls").with(:query => params).should have_been_made
+      end
+
+      it "should return array of resources" do
+        pull_requests = github.pull_requests.pull_requests user, repo, params
+        pull_requests.should be_an Array
+        pull_requests.should have(1).items
+      end
+
+      it "should be a mash type" do
+        pull_requests = github.pull_requests.pull_requests user, repo, params
+        pull_requests.first.should be_a Hashie::Mash
+      end
+
+      it "should get pull request information" do
+        pull_requests = github.pull_requests.pull_requests user, repo, params
+        pull_requests.first.title.should == 'new-feature'
+      end
+
+      it "should yield to a block" do
+        github.pull_requests.should_receive(:pull_requests).with(user, repo).
+          and_yield('web')
+        github.pull_requests.pull_requests(user, repo) { |param| 'web' }
+      end
+    end
+
+    context 'resource not found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls").
+          to_return(:body => "", :status => [404, "Not Found"])
+      end
+
+      it "should return 404 with a message 'Not Found'" do
+        expect {
+          github.pull_requests.pull_requests user, repo
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # pull_requests
+
+  describe "#pull_request" do
+    context 'check aliases' do
+      it { github.pull_requests.should respond_to :pull_request }
+      it { github.pull_requests.should respond_to :get_pull_request }
+    end
+
+    context 'resource found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}").
+          to_return(:body => fixture('pull_requests/pull_request.json'),
+          :status => 200,
+          :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to get resource without pull_request id" do
+        expect { github.pull_requests.pull_request nil }.to raise_error(ArgumentError)
+      end
+
+      it "should get the resource" do
+        github.pull_requests.pull_request user, repo, pull_request_id
+        a_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}").
+          should have_been_made
+      end
+
+      it "should get pull_request information" do
+        pull_request = github.pull_requests.pull_request user, repo, pull_request_id
+        pull_request.number.should eq pull_request_id
+        pull_request.head.user.login.should == 'octocat'
+      end
+
+      it "should return mash" do
+        pull_request = github.pull_requests.pull_request user, repo, pull_request_id
+        pull_request.should be_a Hashie::Mash
+      end
+    end
+
+    context 'resource not found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}").
+          to_return(:body => fixture('pull_requests/pull_request.json'),
+            :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to retrive resource" do
+        expect {
+          github.pull_requests.pull_request user, repo, pull_request_id
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # pull_request
+
+  describe "create_request" do
+    let(:inputs) {
+      {
+       "title" => "Amazing new feature",
+       "body" => "Please pull this in!",
+       "head" => "octocat:new-feature",
+       "base" => "master",
+       "state" => "open",
+       'unrelated' => 'giberrish'
+      }
+    }
+
+    context "resouce created" do
+      before do
+        stub_post("/repos/#{user}/#{repo}/pulls").
+          with(:body => JSON.generate(inputs.except('unrelated'))).
+          to_return(:body => fixture('pull_requests/pull_request.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should create resource successfully" do
+        github.pull_requests.create_request user, repo, inputs
+        a_post("/repos/#{user}/#{repo}/pulls").with(inputs).should have_been_made
+      end
+
+      it "should return the resource" do
+        pull_request = github.pull_requests.create_request user, repo, inputs
+        pull_request.should be_a Hashie::Mash
+      end
+
+      it "should get the request information" do
+        pull_request = github.pull_requests.create_request user, repo, inputs
+        pull_request.title.should eql "new-feature"
+      end
+    end
+
+    context "failed to create resource" do
+      before do
+        stub_post("/repos/#{user}/#{repo}/pulls").with(inputs).
+          to_return(:body => fixture('pull_requests/pull_request.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+
+      end
+
+      it "should faile to retrieve resource" do
+        expect {
+          github.pull_requests.create_request user, repo, inputs
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # create_request
+
+  describe "#update_request" do
+    let(:inputs) {
+      {
+        "title" => "new title",
+        "body" => "updated body",
+        "state" => "open",
+        "unrelated" => true
+      }
+    }
+
+    context "resouce updateed" do
+      before do
+        stub_patch("/repos/#{user}/#{repo}/pulls/#{pull_request_id}").
+          with(:body => JSON.generate(inputs.except('unrelated'))).
+          to_return(:body => fixture('pull_requests/pull_request.json'),
+                :status => 201,
+                :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should create resource successfully" do
+        github.pull_requests.update_request user, repo, pull_request_id, inputs
+        a_patch("/repos/#{user}/#{repo}/pulls/#{pull_request_id}").with(inputs).
+          should have_been_made
+      end
+
+      it "should return the resource" do
+        pull_request = github.pull_requests.update_request user, repo,
+                                                         pull_request_id, inputs
+        pull_request.should be_a Hashie::Mash
+      end
+
+      it "should get the pull_request information" do
+        pull_request = github.pull_requests.update_request user, repo,
+                                                        pull_request_id, inputs
+        pull_request.title.should == 'new-feature'
+      end
+    end
+
+    context "failed to create resource" do
+      before do
+        stub_patch("/repos/#{user}/#{repo}/pulls/#{pull_request_id}").
+          with(inputs).
+          to_return(:body => fixture('pull_requests/pull_request.json'),
+            :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should faile to retrieve resource" do
+        expect {
+          github.pull_requests.update_request user, repo, pull_request_id, inputs
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # update_request
+
+  describe "#commits" do
+    context 'check aliases' do
+      it { github.pull_requests.should respond_to :commits }
+      it { github.pull_requests.should respond_to :request_commits }
+    end
+
+    context 'resource found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/commits").
+          to_return(:body => fixture('pull_requests/commits.json'),
+            :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "throws error if pull_request_id not provided" do
+        expect {
+          github.pull_requests.commits user, repo, nil
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should get the resources" do
+        github.pull_requests.commits user, repo, pull_request_id
+        a_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/commits").
+          should have_been_made
+      end
+
+      it "should return array of resources" do
+        pull_requests = github.pull_requests.commits user, repo, pull_request_id
+        pull_requests.should be_an Array
+        pull_requests.should have(1).items
+      end
+
+      it "should be a mash type" do
+        pull_requests = github.pull_requests.commits user, repo, pull_request_id
+        pull_requests.first.should be_a Hashie::Mash
+      end
+
+      it "should get pull request information" do
+        pull_requests = github.pull_requests.commits user, repo, pull_request_id
+        pull_requests.first.committer.name.should == 'Scott Chacon'
+      end
+
+      it "should yield to a block" do
+        github.pull_requests.should_receive(:commits).
+          with(user, repo, pull_request_id).and_yield('web')
+        github.pull_requests.commits(user, repo, pull_request_id) {|param| 'web' }
+      end
+    end
+
+    context 'resource not found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/commits").
+          to_return(:body => "", :status => [404, "Not Found"])
+      end
+
+      it "should return 404 with a message 'Not Found'" do
+        expect {
+          github.pull_requests.commits user, repo, pull_request_id
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # commits
+
+  describe "#files" do
+    context 'check aliases' do
+      it { github.pull_requests.should respond_to :files }
+      it { github.pull_requests.should respond_to :request_files }
+    end
+
+    context 'resource found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/files").
+          to_return(:body => fixture('pull_requests/files.json'),
+            :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should get the resources" do
+        github.pull_requests.files user, repo, pull_request_id
+        a_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/files").
+          should have_been_made
+      end
+
+      it "should return array of resources" do
+        pull_requests = github.pull_requests.files user, repo, pull_request_id
+        pull_requests.should be_an Array
+        pull_requests.should have(1).items
+      end
+
+      it "should be a mash type" do
+        pull_requests = github.pull_requests.files user, repo, pull_request_id
+        pull_requests.first.should be_a Hashie::Mash
+      end
+
+      it "should get pull request information" do
+        pull_requests = github.pull_requests.files user, repo, pull_request_id
+        pull_requests.first.filename.should == 'file1.txt'
+      end
+
+      it "should yield to a block" do
+        github.pull_requests.should_receive(:files).with(user, repo, pull_request_id).
+          and_yield('web')
+        github.pull_requests.files(user, repo, pull_request_id) { |param| 'web' }
+      end
+    end
+
+    context 'resource not found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/files").
+          to_return(:body => "", :status => [404, "Not Found"])
+      end
+
+      it "should return 404 with a message 'Not Found'" do
+        expect {
+          github.pull_requests.files user, repo, pull_request_id
+        }.to raise_error(Github::Error::NotFound)
+      end
+    end
+  end # files
+
+  describe "#merged?" do
+    context "checks whetehr pull request has been merged" do
+      before do
+        github.oauth_token = nil
+        github.user = nil
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/merge").
+          to_return(:body => "", :status => 404, :headers => {:user_agent => github.user_agent})
+      end
+
+      it "should fail validation " do
+        expect {
+          github.pull_requests.merged?(nil, nil, pull_request_id)
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should return false if resource not found" do
+        merged = github.pull_requests.merged? user, repo, pull_request_id
+        merged.should be_false
+      end
+
+      it "should return true if resoure found" do
+        stub_get("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/merge").
+          to_return(:body => "", :status => 200,
+                    :headers => {:user_agent => github.user_agent})
+        merged = github.pull_requests.merged? user, repo, pull_request_id
+        merged.should be_true
+      end
+    end
+  end # merged?
+
+  describe "#merge" do
+    context 'successful' do
+      before do
+        stub_put("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/merge").
+          to_return(:body => fixture('pull_requests/merge_success.json'),
+                    :status => 200,
+                    :headers => {:user_agent => github.user_agent})
+      end
+
+      it 'performs request' do
+        github.pull_requests.merge user, repo, pull_request_id
+        a_put("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/merge").
+          should have_been_made
+      end
+
+      it 'response contains merge success flag' do
+        response = github.pull_requests.merge(user, repo, pull_request_id)
+        response.merged.should be_true
+      end
+    end
+
+    context 'cannot be performed' do
+      before do
+        stub_put("/repos/#{user}/#{repo}/pulls/#{pull_request_id}/merge").
+          to_return(:body => fixture('pull_requests/merge_failure.json'),
+                    :status => 200,
+                    :headers => {:user_agent => github.user_agent})
+
+      end
+
+      it 'response contains merge failure flag' do
+        response = github.pull_requests.merge(user, repo, pull_request_id)
+        response.merged.should be_false
+      end
+    end
+  end # merge
+
+end # Github::PullRequests