github_api 0.4.11 → 0.5.0.rc1

data/spec/github/pull_requests_spec.rb

@@ -8,11 +8,8 @@ describe Github::PullRequests do
 
   after { reset_authentication_for github }
 
-  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
+  describe "#list" do
+    it { github.pull_requests.should respond_to :all }
 
     context 'resource found' do
       let(:inputs) { { 'state'=> 'closed', 'unrelated' => true } }
@@ -26,34 +23,34 @@ describe Github::PullRequests do
       end
 
       it "throws error if pull_request id not provided" do
-        expect { github.pull_requests.pull_requests nil}.to raise_error(ArgumentError)
+        expect { github.pull_requests.list nil}.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.pull_requests.pull_requests user, repo, inputs
+        github.pull_requests.list user, repo, inputs
         a_get("/repos/#{user}/#{repo}/pulls").with(:query => inputs).should have_been_made
       end
 
       it "should return array of resources" do
-        pull_requests = github.pull_requests.pull_requests user, repo, inputs
+        pull_requests = github.pull_requests.list user, repo, inputs
         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, inputs
+        pull_requests = github.pull_requests.list user, repo, inputs
         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, inputs
+        pull_requests = github.pull_requests.list user, repo, inputs
         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).
+        github.pull_requests.should_receive(:list).with(user, repo).
           and_yield('web')
-        github.pull_requests.pull_requests(user, repo) { |param| 'web' }
+        github.pull_requests.list(user, repo) { |param| 'web' }
       end
     end
 
@@ -65,17 +62,14 @@ describe Github::PullRequests do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.pull_requests.pull_requests user, repo
+          github.pull_requests.list user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # pull_requests
+  end # list
 
-  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
+  describe "#get" do
+    it { github.pull_requests.should respond_to :find }
 
     context 'resource found' do
       before do
@@ -86,23 +80,23 @@ describe Github::PullRequests do
       end
 
       it "should fail to get resource without pull_request id" do
-        expect { github.pull_requests.pull_request nil }.to raise_error(ArgumentError)
+        expect { github.pull_requests.get nil }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.pull_requests.pull_request user, repo, pull_request_id
+        github.pull_requests.get 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 = github.pull_requests.get 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 = github.pull_requests.get user, repo, pull_request_id
         pull_request.should be_a Hashie::Mash
       end
     end
@@ -117,13 +111,13 @@ describe Github::PullRequests do
 
       it "should fail to retrive resource" do
         expect {
-          github.pull_requests.pull_request user, repo, pull_request_id
+          github.pull_requests.get user, repo, pull_request_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # pull_request
+  end # get
 
-  describe "create_request" do
+  describe "#create" do
     let(:inputs) {
       {
        "title" => "Amazing new feature",
@@ -143,17 +137,17 @@ describe Github::PullRequests do
       end
 
       it "should create resource successfully" do
-        github.pull_requests.create_request user, repo, inputs
+        github.pull_requests.create 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 = github.pull_requests.create 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 = github.pull_requests.create user, repo, inputs
         pull_request.title.should eql "new-feature"
       end
     end
@@ -167,13 +161,13 @@ describe Github::PullRequests do
 
       it "should faile to retrieve resource" do
         expect {
-          github.pull_requests.create_request user, repo, inputs
+          github.pull_requests.create user, repo, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # create_request
+  end # create
 
-  describe "#update_request" do
+  describe "#update" do
     let(:inputs) {
       {
         "title" => "new title",
@@ -193,20 +187,18 @@ describe Github::PullRequests do
       end
 
       it "should create resource successfully" do
-        github.pull_requests.update_request user, repo, pull_request_id, inputs
+        github.pull_requests.update 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 = github.pull_requests.update 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 = github.pull_requests.update user, repo, pull_request_id, inputs
         pull_request.title.should == 'new-feature'
       end
     end
@@ -222,18 +214,13 @@ describe Github::PullRequests do
 
       it "should faile to retrieve resource" do
         expect {
-          github.pull_requests.update_request user, repo, pull_request_id, inputs
+          github.pull_requests.update user, repo, pull_request_id, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # update_request
+  end # update
 
   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").
@@ -292,10 +279,7 @@ describe Github::PullRequests do
   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
+    it { github.pull_requests.should respond_to :files }
 
     context 'resource found' do
       before do

data/spec/github/repos/collaborators_spec.rb

@@ -8,41 +8,46 @@ describe Github::Repos::Collaborators do
 
   after { github.user, github.repo, github.oauth_token = nil, nil, nil }
 
-  describe "collaborators" do
+  describe "#list" do
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/collaborators").
-          to_return(:body => fixture('repos/collaborators.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/collaborators.json'),
+            :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without username" do
-        expect { github.repos.collaborators }.to raise_error(ArgumentError)
+        expect {
+          github.repos.collaborators.list
+        }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.repos.collaborators user, repo
+        github.repos.collaborators.list user, repo
         a_get("/repos/#{user}/#{repo}/collaborators").should have_been_made
       end
 
       it "should return array of resources" do
-        collaborators = github.repos.collaborators user, repo
+        collaborators = github.repos.collaborators.list user, repo
         collaborators.should be_an Array
         collaborators.should have(1).items
       end
 
       it "should be a mash type" do
-        collaborators = github.repos.collaborators user, repo
+        collaborators = github.repos.collaborators.list user, repo
         collaborators.first.should be_a Hashie::Mash
       end
 
       it "should get collaborator information" do
-        collaborators = github.repos.collaborators user, repo
+        collaborators = github.repos.collaborators.list user, repo
         collaborators.first.login.should == 'octocat'
       end
 
       it "should yield to a block" do
-        github.repos.should_receive(:collaborators).with(user, repo).and_yield('web')
-        github.repos.collaborators(user, repo) { |param| 'web' }
+        github.repos.collaborators.should_receive(:list).
+          with(user, repo).and_yield('web')
+        github.repos.collaborators.list(user, repo) { |param| 'web' }
       end
     end
 
@@ -54,7 +59,7 @@ describe Github::Repos::Collaborators do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.repos.collaborators user, repo
+          github.repos.collaborators.list user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
@@ -70,13 +75,14 @@ describe Github::Repos::Collaborators do
 
       it "should fail to get resource without collaborator name" do
         expect {
-          github.repos.collaborator? user, repo, nil
+          github.repos.collaborators.collaborator? user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.repos.collaborator? user, repo, collaborator
-        a_get("/repos/#{user}/#{repo}/collaborators/#{collaborator}").should have_been_made
+        github.repos.collaborators.collaborator? user, repo, collaborator
+        a_get("/repos/#{user}/#{repo}/collaborators/#{collaborator}").
+          should have_been_made
       end
 
       it "should find collaborator" do
@@ -100,21 +106,22 @@ describe Github::Repos::Collaborators do
     end
   end # collaborator?
 
-  describe "add_collaborator" do
+  describe "#add" do
     context "resouce added" do
       before do
         stub_put("/repos/#{user}/#{repo}/collaborators/#{collaborator}").
-          to_return(:body => '', :status => 204, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => '', :status => 204,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to add resource if 'collaborator' input is missing" do
         expect {
-          github.repos.add_collaborator user, repo, nil
+          github.repos.collaborators.add user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should add resource successfully" do
-        github.repos.add_collaborator user, repo, collaborator
+        github.repos.collaborators.add user, repo, collaborator
         a_put("/repos/#{user}/#{repo}/collaborators/#{collaborator}").should have_been_made
       end
     end
@@ -122,48 +129,52 @@ describe Github::Repos::Collaborators do
     context "failed to add resource" do
       before do
         stub_put("/repos/#{user}/#{repo}/collaborators/#{collaborator}").
-          to_return(:body => '', :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => '', :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to add resource" do
         expect {
-          github.repos.add_collaborator user, repo, collaborator
+          github.repos.collaborators.add user, repo, collaborator
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # add_collaborator
+  end # add
 
-  describe "remove_collaborator" do
-    context "resouce added" do
+  describe "#remove" do
+    context "resouce removed" do
       before do
         stub_delete("/repos/#{user}/#{repo}/collaborators/#{collaborator}").
-          to_return(:body => '', :status => 204, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => '', :status => 204,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to add resource if 'collaborator' input is missing" do
         expect {
-          github.repos.remove_collaborator user, repo, nil
+          github.repos.collaborators.remove user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should add resource successfully" do
-        github.repos.remove_collaborator user, repo, collaborator
-        a_delete("/repos/#{user}/#{repo}/collaborators/#{collaborator}").should have_been_made
+        github.repos.collaborators.remove user, repo, collaborator
+        a_delete("/repos/#{user}/#{repo}/collaborators/#{collaborator}").
+          should have_been_made
       end
     end
 
     context "failed to remove resource" do
       before do
         stub_delete("/repos/#{user}/#{repo}/collaborators/#{collaborator}").
-          to_return(:body => '', :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => '', :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to remove resource" do
         expect {
-          github.repos.remove_collaborator user, repo, collaborator
+          github.repos.collaborators.remove user, repo, collaborator
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # remove_collaborator
+  end # remove
 
 end # Github::Repos::Collaborators

data/spec/github/repos/commits_spec.rb

@@ -7,41 +7,76 @@ describe Github::Repos::Commits do
 
   after { github.user, github.repo, github.oauth_token = nil, nil, nil }
 
-  describe "commits" do
+  describe "#compare" do
+    let(:base) { 'master' }
+    let(:head) { 'topic' }
+
+    context 'resource found' do
+      before do
+        stub_get("/repos/#{user}/#{repo}/compare/#{base}...#{head}").
+          to_return(:body => fixture('repos/commit_comparison.json'),
+            :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to get resource without base" do
+        expect {
+          github.repos.commits.compare user, repo, nil, head
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should compare successfully" do
+        github.repos.commits.compare user, repo, base, head
+        a_get("/repos/#{user}/#{repo}/compare/#{base}...#{head}").should have_been_made
+      end
+
+      it "should get comparison information" do
+        commit = github.repos.commits.compare user, repo, base, head
+        commit.base_commit.commit.author.name.should == 'Monalisa Octocat'
+      end
+    end
+  end # compare
+
+  describe "#list" do
+    it { github.repos.commits.should respond_to :all }
+
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/commits").
-          to_return(:body => fixture('repos/commits.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/commits.json'),
+            :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without username" do
-        expect { github.repos.commits }.to raise_error(ArgumentError)
+        expect { github.repos.commits.list }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.repos.commits user, repo
+        github.repos.commits.list user, repo
         a_get("/repos/#{user}/#{repo}/commits").should have_been_made
       end
 
       it "should return array of resources" do
-        commits = github.repos.commits user, repo
+        commits = github.repos.commits.list user, repo
         commits.should be_an Array
         commits.should have(1).items
       end
 
       it "should be a mash type" do
-        commits = github.repos.commits user, repo
+        commits = github.repos.commits.list user, repo
         commits.first.should be_a Hashie::Mash
       end
 
       it "should get commit information" do
-        commits = github.repos.commits user, repo
+        commits = github.repos.commits.list user, repo
         commits.first.author.name.should == 'Scott Chacon'
       end
 
       it "should yield to a block" do
-        github.repos.should_receive(:commits).with(user, repo).and_yield('web')
-        github.repos.commits(user, repo) { |param| 'web' }
+        github.repos.commits.should_receive(:list).
+          with(user, repo).and_yield('web')
+        github.repos.commits.list(user, repo) { |param| 'web' }
       end
     end
 
@@ -53,15 +88,17 @@ describe Github::Repos::Commits do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.repos.commits user, repo
+          github.repos.commits.list user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # commits
+  end # list
 
-  describe "commit" do
+  describe "#get" do
     let(:sha) { '23432dfosfsufd' }
 
+    it { github.repos.commits.should respond_to :find }
+
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/commits/#{sha}").
@@ -70,22 +107,22 @@ describe Github::Repos::Commits do
 
       it "should fail to get resource without sha key" do
         expect {
-          github.repos.commit(user, repo, nil)
+          github.repos.commits.get user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.repos.commit user, repo, sha
+        github.repos.commits.get user, repo, sha
         a_get("/repos/#{user}/#{repo}/commits/#{sha}").should have_been_made
       end
 
       it "should get commit information" do
-        commit = github.repos.commit user, repo, sha
+        commit = github.repos.commits.get user, repo, sha
         commit.commit.author.name.should == 'Monalisa Octocat'
       end
 
       it "should return mash" do
-        commit = github.repos.commit user, repo, sha
+        commit = github.repos.commits.get user, repo, sha
         commit.should be_a Hashie::Mash
       end
     end
@@ -98,11 +135,11 @@ describe Github::Repos::Commits do
 
       it "should fail to retrive resource" do
         expect {
-          github.repos.commit user, repo, sha
+          github.repos.commits.get user, repo, sha
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # commit
+  end # get
 
   describe "commit comments" do
     context "resource found" do
@@ -112,33 +149,36 @@ describe Github::Repos::Commits do
       end
 
       it "should fail to get resource without username" do
-        expect { github.repos.repo_comments }.to raise_error(ArgumentError)
+        expect {
+          github.repos.commits.repo_comments
+        }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.repos.repo_comments user, repo
+        github.repos.commits.repo_comments user, repo
         a_get("/repos/#{user}/#{repo}/comments").should have_been_made
       end
 
       it "should return array of resources" do
-        repo_comments = github.repos.repo_comments user, repo
+        repo_comments = github.repos.commits.repo_comments user, repo
         repo_comments.should be_an Array
         repo_comments.should have(1).items
       end
 
       it "should be a mash type" do
-        repo_comments = github.repos.repo_comments user, repo
+        repo_comments = github.repos.commits.repo_comments user, repo
         repo_comments.first.should be_a Hashie::Mash
       end
 
       it "should get commit comment information" do
-        repo_comments = github.repos.repo_comments user, repo
+        repo_comments = github.repos.commits.repo_comments user, repo
         repo_comments.first.user.login.should == 'octocat'
       end
 
       it "should yield to a block" do
-        github.repos.should_receive(:repo_comments).with(user, repo).and_yield('web')
-        github.repos.repo_comments(user, repo) { |param| 'web' }
+        github.repos.commits.should_receive(:repo_comments).
+          with(user, repo).and_yield('web')
+        github.repos.commits.repo_comments(user, repo) { |param| 'web' }
       end
     end
 
@@ -150,11 +190,11 @@ describe Github::Repos::Commits do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.repos.repo_comments user, repo
+          github.repos.commits.repo_comments user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # repo comments
+  end # repo_comments
 
   describe "commit_comments" do
     let(:sha) { '23432dfosfsufd' }
@@ -167,35 +207,36 @@ describe Github::Repos::Commits do
 
       it "should fail to get resource without sha key" do
         expect {
-          github.repos.commit_comments(user, repo, nil)
+          github.repos.commits.commit_comments user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.repos.commit_comments user, repo, sha
+        github.repos.commits.commit_comments user, repo, sha
         a_get("/repos/#{user}/#{repo}/commits/#{sha}/comments").
           should have_been_made
       end
 
       it "should return array of resources" do
-        commit_comments = github.repos.commit_comments user, repo, sha
+        commit_comments = github.repos.commits.commit_comments user, repo, sha
         commit_comments.should be_an Array
         commit_comments.should have(1).items
       end
 
       it "should be a mash type" do
-        commit_comments = github.repos.commit_comments user, repo, sha
+        commit_comments = github.repos.commits.commit_comments user, repo, sha
         commit_comments.first.should be_a Hashie::Mash
       end
 
       it "should get commit comment information" do
-        commit_comments = github.repos.commit_comments user, repo, sha
+        commit_comments = github.repos.commits.commit_comments user, repo, sha
         commit_comments.first.user.login.should == 'octocat'
       end
 
       it "should yield to a block" do
-        github.repos.should_receive(:commit_comments).with(user, repo, sha).and_yield('web')
-        github.repos.commit_comments(user, repo, sha) { |param| 'web' }
+        github.repos.commits.should_receive(:commit_comments).
+          with(user, repo, sha).and_yield('web')
+        github.repos.commits.commit_comments(user, repo, sha) { |param| 'web' }
       end
     end
 
@@ -207,13 +248,13 @@ describe Github::Repos::Commits do
 
       it "should fail to retrive resource" do
         expect {
-          github.repos.commit_comments user, repo, sha
+          github.repos.commits.commit_comments user, repo, sha
         }.to raise_error(Github::Error::NotFound)
       end
     end
   end # commit_comments
 
-  describe "commit_comment" do
+  describe "#commit_comment" do
     let(:comment_id) { 1 }
 
     context "resource found" do
@@ -224,22 +265,22 @@ describe Github::Repos::Commits do
 
       it "should fail to get resource without comment id" do
         expect {
-          github.repos.commit_comment user, repo, nil
+          github.repos.commits.commit_comment user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.repos.commit_comment user, repo, comment_id
+        github.repos.commits.commit_comment user, repo, comment_id
         a_get("/repos/#{user}/#{repo}/comments/#{comment_id}").should have_been_made
       end
 
       it "should get commit comment information" do
-        commit_comment = github.repos.commit_comment user, repo, comment_id
+        commit_comment = github.repos.commits.commit_comment user, repo, comment_id
         commit_comment.user.login.should == 'octocat'
       end
 
       it "should return mash" do
-        commit_comment = github.repos.commit_comment user, repo, comment_id
+        commit_comment = github.repos.commits.commit_comment user, repo, comment_id
         commit_comment.should be_a Hashie::Mash
       end
     end
@@ -252,7 +293,7 @@ describe Github::Repos::Commits do
 
       it "should fail to retrive resource" do
         expect {
-          github.repos.commit_comment user, repo, comment_id
+          github.repos.commits.commit_comment user, repo, comment_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
@@ -276,46 +317,46 @@ describe Github::Repos::Commits do
 
       it "should fail to create resource if 'body' input is missing" do
         expect {
-          github.repos.create_comment user, repo, sha, inputs.except('body')
+          github.repos.commits.create_comment user, repo, sha, inputs.except('body')
         }.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)
+          github.repos.commits.create_comment user, repo, sha, inputs.except(:commit_id)
         }.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)
+          github.repos.commits.create_comment user, repo, sha, inputs.except(:line)
         }.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)
+          github.repos.commits.create_comment user, repo, sha, inputs.except(:path)
         }.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)
+          github.repos.commits.create_comment user, repo, sha, inputs.except(:position)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
-        github.repos.create_comment user, repo, sha, inputs
+        github.repos.commits.create_comment user, repo, sha, inputs
         a_post("/repos/#{user}/#{repo}/commits/#{sha}/comments").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        comment = github.repos.create_comment user, repo, sha, inputs
+        comment = github.repos.commits.create_comment user, repo, sha, inputs
         comment.should be_a Hashie::Mash
       end
 
       it "should get the commit comment information" do
-        comment = github.repos.create_comment user, repo, sha, inputs
+        comment = github.repos.commits.create_comment user, repo, sha, inputs
         comment.user.login.should == 'octocat'
       end
     end
@@ -329,7 +370,7 @@ describe Github::Repos::Commits do
 
       it "should fail to retrieve resource" do
         expect {
-          github.repos.create_comment user, repo, sha, inputs
+          github.repos.commits.create_comment user, repo, sha, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
@@ -341,22 +382,24 @@ describe Github::Repos::Commits do
     context "resource deleted successfully" do
       before do
         stub_delete("/repos/#{user}/#{repo}/comments/#{comment_id}").
-          to_return(:body => '', :status => 204, :headers => { :content_type => "application/json; charset=utf-8"})
+          to_return(:body => '', :status => 204,
+            :headers => { :content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to delete without 'user/repo' parameters" do
-        github.user, github.repo = nil, nil
-        expect { github.repos.delete_comment }.to raise_error(ArgumentError)
+        expect {
+          github.repos.commits.delete_comment
+        }.to raise_error(ArgumentError)
       end
 
       it "should fail to delete resource without 'comment_id'" do
         expect {
-          github.repos.delete_comment user, repo, nil
+          github.repos.commits.delete_comment user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should delete the resource" do
-        github.repos.delete_comment user, repo, comment_id
+        github.repos.commits.delete_comment user, repo, comment_id
         a_delete("/repos/#{user}/#{repo}/comments/#{comment_id}").should have_been_made
       end
     end
@@ -370,41 +413,42 @@ describe Github::Repos::Commits do
 
       it "should fail to find resource" do
         expect {
-          github.repos.delete_comment user, repo, comment_id
+          github.repos.commits.delete_comment user, repo, comment_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
   end # delete_comment
 
-  describe "update_comment" do
+  describe "#update_comment" do
     let(:comment_id) { 1 }
     let(:inputs) { {'body'=> 'web'} }
 
     context "resouce created" do
       before do
         stub_patch("/repos/#{user}/#{repo}/comments/#{comment_id}").with(inputs).
-          to_return(:body => fixture('repos/commit_comment.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
-
+          to_return(:body => fixture('repos/commit_comment.json'),
+            :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to create resource if 'body' input is missing" do
         expect {
-          github.repos.update_comment user, repo, comment_id, inputs.except('body')
+          github.repos.commits.update_comment user, repo, comment_id, inputs.except('body')
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
-        github.repos.update_comment user, repo, comment_id, inputs
+        github.repos.commits.update_comment user, repo, comment_id, inputs
         a_patch("/repos/#{user}/#{repo}/comments/#{comment_id}").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        comment = github.repos.update_comment user, repo, comment_id, inputs
+        comment = github.repos.commits.update_comment user, repo, comment_id, inputs
         comment.should be_a Hashie::Mash
       end
 
       it "should get the commit comment information" do
-        comment = github.repos.update_comment user, repo, comment_id, inputs
+        comment = github.repos.commits.update_comment user, repo, comment_id, inputs
         comment.user.login.should == 'octocat'
       end
     end
@@ -418,7 +462,7 @@ describe Github::Repos::Commits do
 
       it "should fail to retrieve resource" do
         expect {
-          github.repos.update_comment user, repo, comment_id, inputs
+          github.repos.commits.update_comment user, repo, comment_id, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end