github_api 0.4.11 → 0.5.0.rc1

data/spec/github/repos/downloads_spec.rb

@@ -13,45 +13,45 @@ describe Github::Repos::Downloads do
   it { described_class::VALID_DOWNLOAD_PARAM_NAMES.should_not be_nil }
   it { described_class::REQUIRED_PARAMS.should_not be_nil }
 
-  describe "downloads" do
-    it { github.repos.should respond_to :downloads }
-    it { github.repos.should respond_to :list_downloads }
-    it { github.repos.should respond_to :get_downloads }
+  describe "#list" do
+    it { github.repos.downloads.should respond_to :list }
 
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/downloads").
-          to_return(:body => fixture('repos/downloads.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/downloads.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without username" do
-        expect { github.repos.downloads }.to raise_error(ArgumentError)
+        expect { github.repos.downloads.list }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.repos.downloads  user, repo
+        github.repos.downloads.list  user, repo
         a_get("/repos/#{user}/#{repo}/downloads").should have_been_made
       end
 
       it "should return array of resources" do
-        downloads = github.repos.downloads user, repo
+        downloads = github.repos.downloads.list user, repo
         downloads.should be_an Array
         downloads.should have(1).items
       end
 
       it "should be a mash type" do
-        downloads = github.repos.downloads user, repo
+        downloads = github.repos.downloads.list user, repo
         downloads.first.should be_a Hashie::Mash
       end
 
       it "should get download information" do
-        downloads = github.repos.downloads user, repo
+        downloads = github.repos.downloads.list user, repo
         downloads.first.name.should == 'new_file.jpg'
       end
 
       it "should yield to a block" do
-        github.repos.should_receive(:downloads).with(user, repo).and_yield('web')
-        github.repos.downloads(user, repo) { |param| 'web' }
+        github.repos.downloads.should_receive(:list).
+          with(user, repo).and_yield('web')
+        github.repos.downloads.list(user, repo) { |param| 'web' }
       end
     end
 
@@ -63,43 +63,43 @@ describe Github::Repos::Downloads do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.repos.downloads user, repo
+          github.repos.downloads.list user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # downloads
+  end # list
 
-  describe "download" do
+  describe "#get" do
     let(:download_id) { 1 }
 
-    it { github.repos.should respond_to :download }
-    it { github.repos.should respond_to :get_download }
+    it { github.repos.downloads.should respond_to :find }
 
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/downloads/#{download_id}").
-          to_return(:body => fixture('repos/download.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/download.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without download id" do
         expect {
-          github.repos.download(user, repo, nil)
+          github.repos.downloads.get user, repo, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.repos.download user, repo, download_id
+        github.repos.downloads.get user, repo, download_id
         a_get("/repos/#{user}/#{repo}/downloads/#{download_id}").should have_been_made
       end
 
       it "should get download information" do
-        download = github.repos.download user, repo, download_id
+        download = github.repos.downloads.get user, repo, download_id
         download.id.should == download_id
         download.name.should == 'new_file.jpg'
       end
 
       it "should return mash" do
-        download = github.repos.download user, repo, download_id
+        download = github.repos.downloads.get user, repo, download_id
         download.should be_a Hashie::Mash
       end
     end
@@ -112,34 +112,34 @@ describe Github::Repos::Downloads do
 
       it "should fail to retrive resource" do
         expect {
-          github.repos.download user, repo, download_id
+          github.repos.downloads.get user, repo, download_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # download
+  end # get
 
-  describe "delete_download" do
+  describe "#delete" do
     let(:download_id) { 1 }
 
     context "resource edited successfully" do
       before do
         stub_delete("/repos/#{user}/#{repo}/downloads/#{download_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_download }.to raise_error(ArgumentError)
+        expect { github.repos.downloads.delete }.to raise_error(ArgumentError)
       end
 
       it "should fail to delete resource without 'download_id'" do
         expect {
-          github.repos.delete_download user, repo
+          github.repos.downloads.delete user, repo
         }.to raise_error(ArgumentError)
       end
 
       it "should delete the resource" do
-        github.repos.delete_download user, repo, download_id
+        github.repos.downloads.delete user, repo, download_id
         a_delete("/repos/#{user}/#{repo}/downloads/#{download_id}").should have_been_made
       end
     end
@@ -147,19 +147,19 @@ describe Github::Repos::Downloads do
     context "failed to edit resource" do
       before do
         stub_delete("/repos/#{user}/#{repo}/downloads/#{download_id}").
-          to_return(:body => fixture("repos/download.json"), :status => 404, :headers => { :content_type => "application/json; charset=utf-8"})
-
+          to_return(:body => fixture("repos/download.json"), :status => 404,
+            :headers => { :content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to find resource" do
         expect {
-          github.repos.delete_download user, repo, download_id
+          github.repos.downloads.delete user, repo, download_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # delete_download
+  end # delete
 
-  describe "create_download" do
+  describe "#create" do
     let(:inputs) { {:name => 'new_file.jpg', :size => 114034, :description => "Latest release", :content_type => 'text/plain'} }
 
     context "resouce created" do
@@ -171,28 +171,28 @@ describe Github::Repos::Downloads do
 
       it "should fail to create resource if 'name' input is missing" do
         expect {
-          github.repos.create_download user, repo, inputs.except(:name)
+          github.repos.downloads.create user, repo, inputs.except(:name)
         }.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)
+          github.repos.downloads.create user, repo, inputs.except(:size)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
-        github.repos.create_download user, repo, inputs
+        github.repos.downloads.create user, repo, inputs
         a_post("/repos/#{user}/#{repo}/downloads").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        download = github.repos.create_download user, repo, inputs
+        download = github.repos.downloads.create user, repo, inputs
         download.should be_a Hashie::Mash
       end
 
       it "should get the download information" do
-        download = github.repos.create_download user, repo, inputs
+        download = github.repos.downloads.create user, repo, inputs
         download.name.should == 'new_file.jpg'
       end
     end
@@ -200,16 +200,17 @@ describe Github::Repos::Downloads do
     context "failed to create resource" 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"})
+          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
         expect {
-          github.repos.create_download(user, repo, inputs)
+          github.repos.downloads.create user, repo, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # create_download
+  end # create
 
   describe 'upload' do
     let(:resource) { stub(:resource) }
@@ -223,14 +224,14 @@ describe Github::Repos::Downloads do
       end
 
       it "should fail if resource is of incorrect type" do
-        expect { github.repos.upload resource, nil }.to raise_error(ArgumentError)
+        expect { github.repos.downloads.upload resource, nil }.to raise_error(ArgumentError)
       end
 
       it "should upload resource successfully" do
         res = stub(:response, :body => 'success')
         uploader = stub(:uploader, :send => res)
         Github::S3Uploader.should_receive(:new).with(resource, filename) { uploader }
-        github.repos.upload(resource, filename).should == 'success'
+        github.repos.downloads.upload(resource, filename).should == 'success'
       end
     end
   end # upload

data/spec/github/repos/forks_spec.rb

@@ -7,45 +7,44 @@ describe Github::Repos::Forks do
 
   after { github.user, github.repo, github.oauth_token = nil, nil, nil }
 
-  describe "forks" do
-    it { github.repos.should respond_to :forks }
-    it { github.repos.should respond_to :repo_forks }
-    it { github.repos.should respond_to :repository_forks }
+  describe "#list" do
+    it { github.repos.forks.should respond_to :all }
 
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/forks").
-          to_return(:body => fixture('repos/forks.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/forks.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without username" do
-        expect { github.repos.forks }.to raise_error(ArgumentError)
+        expect { github.repos.forks.list }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.repos.forks user, repo
+        github.repos.forks.list user, repo
         a_get("/repos/#{user}/#{repo}/forks").should have_been_made
       end
 
       it "should return array of resources" do
-        forks = github.repos.forks user, repo
+        forks = github.repos.forks.list user, repo
         forks.should be_an Array
         forks.should have(1).items
       end
 
       it "should be a mash type" do
-        forks = github.repos.forks user, repo
+        forks = github.repos.forks.list user, repo
         forks.first.should be_a Hashie::Mash
       end
 
       it "should get fork information" do
-        forks = github.repos.forks user, repo
+        forks = github.repos.forks.list user, repo
         forks.first.name.should == 'Hello-World'
       end
 
       it "should yield to a block" do
-        github.repos.should_receive(:forks).with(user, repo).and_yield('web')
-        github.repos.forks(user, repo) { |param| 'web' }
+        github.repos.forks.should_receive(:list).with(user, repo).and_yield('web')
+        github.repos.forks.list(user, repo) { |param| 'web' }
       end
     end
 
@@ -57,34 +56,34 @@ describe Github::Repos::Forks do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.repos.forks user, repo
+          github.repos.forks.list user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # forks
+  end # list
 
-  describe "create_hook" do
+  describe "#create" do
     let(:inputs) { {:org => 'github'} }
 
     context "resouce created" do
       before do
         stub_post("/repos/#{user}/#{repo}/forks").with(inputs).
-          to_return(:body => fixture('repos/fork.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-
+          to_return(:body => fixture('repos/fork.json'), :status => 201,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should create resource successfully" do
-        github.repos.create_fork(user, repo, inputs)
+        github.repos.forks.create(user, repo, inputs)
         a_post("/repos/#{user}/#{repo}/forks").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        fork = github.repos.create_fork user, repo, inputs
+        fork = github.repos.forks.create user, repo, inputs
         fork.should be_a Hashie::Mash
       end
 
       it "should get the fork information" do
-        fork = github.repos.create_fork(user, repo, inputs)
+        fork = github.repos.forks.create user, repo, inputs
         fork.name.should == 'Hello-World'
       end
     end
@@ -92,16 +91,16 @@ describe Github::Repos::Forks do
     context "failed to create resource" do
       before do
         stub_post("/repos/#{user}/#{repo}/forks").with(inputs).
-          to_return(:body => fixture('repos/fork.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-
+          to_return(:body => fixture('repos/fork.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should faile to retrieve resource" do
         expect {
-          github.repos.create_fork user, repo, inputs
+          github.repos.forks.create user, repo, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # create_fork
+  end # create
 
 end # Github::Repos::Forks

data/spec/github/repos/hooks_spec.rb

@@ -13,47 +13,44 @@ describe Github::Repos::Hooks do
   it { described_class::VALID_HOOK_PARAM_VALUES.should_not be_nil }
   it { described_class::REQUIRED_PARAMS.should_not be_nil }
 
-  describe "hooks" do
-    context 'check aliases' do
-      it { github.repos.should respond_to :hooks }
-      it { github.repos.should respond_to :repo_hooks }
-      it { github.repos.should respond_to :repository_hooks }
-    end
+  describe "#list" do
+    it { github.repos.hooks.should respond_to :all }
 
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/hooks").
-          to_return(:body => fixture('repos/hooks.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/hooks.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without username" do
-        expect { github.repos.hooks }.to raise_error(ArgumentError)
+        expect { github.repos.hooks.list }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.repos.hooks user, repo
+        github.repos.hooks.list user, repo
         a_get("/repos/#{user}/#{repo}/hooks").should have_been_made
       end
 
       it "should return array of resources" do
-        hooks = github.repos.hooks user, repo
+        hooks = github.repos.hooks.list user, repo
         hooks.should be_an Array
         hooks.should have(1).items
       end
 
       it "should be a mash type" do
-        hooks = github.repos.hooks user, repo
+        hooks = github.repos.hooks.list user, repo
         hooks.first.should be_a Hashie::Mash
       end
 
       it "should get hook information" do
-        hooks = github.repos.hooks user, repo
+        hooks = github.repos.hooks.list user, repo
         hooks.first.name.should == 'web'
       end
 
       it "should yield to a block" do
-        github.repos.should_receive(:hooks).with(user, repo).and_yield('web')
-        github.repos.hooks(user, repo) { |param| 'web' }
+        github.repos.hooks.should_receive(:list).with(user, repo).and_yield('web')
+        github.repos.hooks.list(user, repo) { |param| 'web' }
       end
     end
 
@@ -65,46 +62,43 @@ describe Github::Repos::Hooks do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.repos.hooks user, repo
+          github.repos.hooks.list user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # hooks
+  end # list
 
-  describe "hook" do
+  describe "#get" do
     let(:hook_id) { 1 }
 
-    context 'check aliases' do
-      it { github.repos.should respond_to :hook }
-      it { github.repos.should respond_to :get_hook }
-      it { github.repos.should respond_to :repo_hook }
-      it { github.repos.should respond_to :get_repo_hook }
-      it { github.repos.should respond_to :repository_hook }
-    end
+    it { github.repos.hooks.should respond_to :find }
 
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/hooks/#{hook_id}").
-          to_return(:body => fixture('repos/hook.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/hook.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without hook id" do
-        expect { github.repos.hook(user, repo, nil)}.to raise_error(ArgumentError)
+        expect {
+          github.repos.hooks.get user, repo, nil
+        }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.repos.hook user, repo, hook_id
+        github.repos.hooks.get user, repo, hook_id
         a_get("/repos/#{user}/#{repo}/hooks/#{hook_id}").should have_been_made
       end
 
       it "should get hook information" do
-        hook = github.repos.hook user, repo, hook_id
+        hook = github.repos.hooks.get user, repo, hook_id
         hook.id.should == hook_id
         hook.name.should == 'web'
       end
 
       it "should return mash" do
-        hook = github.repos.hook user, repo, hook_id
+        hook = github.repos.hooks.get user, repo, hook_id
         hook.should be_a Hashie::Mash
       end
     end
@@ -117,13 +111,13 @@ describe Github::Repos::Hooks do
 
       it "should fail to retrive resource" do
         expect {
-          github.repos.hook user, repo, hook_id
+          github.repos.hooks.get user, repo, hook_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # hook
+  end # get
 
-  describe "create_hook" do
+  describe "#create" do
     let(:inputs) {
       {
         :name => 'web',
@@ -143,33 +137,34 @@ describe Github::Repos::Hooks do
       before do
         stub_post("/repos/#{user}/#{repo}/hooks").
           with(:body => JSON.generate(inputs.except(:unrelated))).
-          to_return(:body => fixture('repos/hook.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/hook.json'), :status => 201,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to create resource if 'name' input is missing" do
         expect {
-          github.repos.create_hook user, repo, inputs.except(:name)
+          github.repos.hooks.create user, repo, inputs.except(:name)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should failt to create resource if 'config' input is missing" do
         expect {
-          github.repos.create_hook user, repo, inputs.except(:config)
+          github.repos.hooks.create user, repo, inputs.except(:config)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
-        github.repos.create_hook user, repo, inputs
+        github.repos.hooks.create user, repo, inputs
         a_post("/repos/#{user}/#{repo}/hooks").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        hook = github.repos.create_hook user, repo, inputs
+        hook = github.repos.hooks.create user, repo, inputs
         hook.should be_a Hashie::Mash
       end
 
       it "should get the hook information" do
-        hook = github.repos.create_hook(user, repo, inputs)
+        hook = github.repos.hooks.create user, repo, inputs
         hook.name.should == 'web'
       end
     end
@@ -177,18 +172,19 @@ describe Github::Repos::Hooks do
     context "fail to create resource" do
       before do
         stub_post("/repos/#{user}/#{repo}/hooks").with(inputs).
-          to_return(:body => fixture('repos/hook.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/hook.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to retrieve resource" do
         expect {
-          github.repos.create_hook user, repo, inputs
+          github.repos.hooks.create user, repo, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # create_hook
+  end # create
 
-  describe "edit_hook" do
+  describe "#edit" do
     let(:hook_id) { 1 }
     let(:inputs) {
       {
@@ -209,45 +205,45 @@ describe Github::Repos::Hooks do
       before do
         stub_patch("/repos/#{user}/#{repo}/hooks/#{hook_id}").
           with(:body => JSON.generate(inputs.except(:unrelated))).
-          to_return(:body => fixture("repos/hook.json"), :status => 200, :headers => { :content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture("repos/hook.json"), :status => 200,
+            :headers => { :content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to edit without 'user/repo' parameters" do
-        github.user, github.repo = nil, nil
-        expect { github.repos.edit_hook }.to raise_error(ArgumentError)
+        expect { github.repos.hooks.edit }.to raise_error(ArgumentError)
       end
 
       it "should fail to edit resource without 'name' parameter" do
         expect{
-          github.repos.edit_hook user, repo, inputs.except(:name)
+          github.repos.hooks.edit user, repo, inputs.except(:name)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should fail to edit resource without 'hook_id'" do
         expect {
-          github.repos.edit_hook user, repo
+          github.repos.hooks.edit user, repo
         }.to raise_error(ArgumentError)
       end
 
       it "should fail to edit resource without 'config' parameter" do
         expect {
-          github.repos.edit_hook user, repo, hook_id, inputs.except(:config)
+          github.repos.hooks.edit user, repo, hook_id, inputs.except(:config)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should edit the resource" do
-        github.repos.edit_hook user, repo, hook_id, inputs
+        github.repos.hooks.edit user, repo, hook_id, inputs
         a_patch("/repos/#{user}/#{repo}/hooks/#{hook_id}").
           with(inputs).should have_been_made
       end
 
       it "should return resource" do
-        hook = github.repos.edit_hook user, repo, hook_id, inputs
+        hook = github.repos.hooks.edit user, repo, hook_id, inputs
         hook.should be_a Hashie::Mash
       end
 
       it "should be able to retrieve information" do
-        hook = github.repos.edit_hook user, repo, hook_id, inputs
+        hook = github.repos.hooks.edit user, repo, hook_id, inputs
         hook.name.should == 'web'
       end
     end
@@ -255,39 +251,40 @@ describe Github::Repos::Hooks do
     context "failed to edit resource" do
       before do
         stub_patch("/repos/#{user}/#{repo}/hooks/#{hook_id}").with(inputs).
-          to_return(:body => fixture("repos/hook.json"), :status => 404, :headers => { :content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture("repos/hook.json"), :status => 404,
+            :headers => { :content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to find resource" do
         expect {
-          github.repos.edit_hook user, repo, hook_id, inputs
+          github.repos.hooks.edit user, repo, hook_id, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # edit_hook
+  end # edit
 
-  describe "delete_hook" do
+  describe "#delete" do
     let(:hook_id) { 1 }
 
     context "resource removed successfully" do
       before do
         stub_delete("/repos/#{user}/#{repo}/hooks/#{hook_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_hook }.to raise_error(ArgumentError)
+        expect { github.repos.hooks.delete }.to raise_error(ArgumentError)
       end
 
       it "should fail to delete resource without 'hook_id'" do
         expect {
-          github.repos.delete_hook user, repo
+          github.repos.hooks.delete user, repo
         }.to raise_error(ArgumentError)
       end
 
       it "should delete the resource" do
-        github.repos.delete_hook user, repo, hook_id
+        github.repos.hooks.delete user, repo, hook_id
         a_delete("/repos/#{user}/#{repo}/hooks/#{hook_id}").should have_been_made
       end
     end
@@ -300,34 +297,34 @@ describe Github::Repos::Hooks do
 
       it "should fail to find resource" do
         expect {
-          github.repos.delete_hook user, repo, hook_id
+          github.repos.hooks.delete user, repo, hook_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # delete_hook
+  end # delete
 
-  describe "test_hook" do
+  describe "#test" do
     let(:hook_id) { 1 }
 
     context "resource tested successfully" do
       before do
         stub_post("/repos/#{user}/#{repo}/hooks/#{hook_id}/test").
-          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 test without 'user/repo' parameters" do
-        github.user, github.repo = nil, nil
-        expect { github.repos.test_hook }.to raise_error(ArgumentError)
+        expect { github.repos.hooks.test }.to raise_error(ArgumentError)
       end
 
       it "should fail to test resource without 'hook_id'" do
         expect {
-          github.repos.test_hook user, repo
+          github.repos.hooks.test user, repo
         }.to raise_error(ArgumentError)
       end
 
       it "should trigger test for the resource" do
-        github.repos.test_hook user, repo, hook_id
+        github.repos.hooks.test user, repo, hook_id
         a_post("/repos/#{user}/#{repo}/hooks/#{hook_id}/test").should have_been_made
       end
     end
@@ -335,15 +332,16 @@ describe Github::Repos::Hooks do
     context "failed to test resource" do
       before do
         stub_post("/repos/#{user}/#{repo}/hooks/#{hook_id}/test").
-          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 find resource" do
         expect {
-          github.repos.test_hook user, repo, hook_id
+          github.repos.hooks.test user, repo, hook_id
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # test_hook
+  end # test
 
 end # Github::Repos::Hooks