github_api 0.4.6 → 0.4.7

data/spec/github/repos/forks_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
-describe Github::Repos::Forks, :type => :base do
+describe Github::Repos::Forks do
+  let(:github) { Github.new }
+  let(:user) { 'peter-murach' }
+  let(:repo) { 'github' }
 
-  describe "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 }
@@ -15,7 +19,6 @@ describe Github::Repos::Forks, :type => :base do
       end
 
       it "should fail to get resource without username" do
-        github.user, github.repo = nil, nil
         expect { github.repos.forks }.to raise_error(ArgumentError)
       end
 

data/spec/github/repos/hooks_spec.rb

@@ -1,6 +1,13 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-describe Github::Repos::Hooks, :type => :base do
+describe Github::Repos::Hooks 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_HOOK_PARAM_NAMES.should_not be_nil }
   it { described_class::VALID_HOOK_PARAM_VALUES.should_not be_nil }
@@ -143,13 +150,13 @@ describe Github::Repos::Hooks, :type => :base do
       it "should fail to create resource if 'name' input is missing" do
         expect {
           github.repos.create_hook user, repo, inputs.except(:name)
-        }.to raise_error(ArgumentError)
+        }.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)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
@@ -214,7 +221,7 @@ describe Github::Repos::Hooks, :type => :base do
       it "should fail to edit resource without 'name' parameter" do
         expect{
           github.repos.edit_hook user, repo, inputs.except(:name)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should fail to edit resource without 'hook_id'" do
@@ -226,12 +233,13 @@ describe Github::Repos::Hooks, :type => :base do
       it "should fail to edit resource without 'config' parameter" do
         expect {
           github.repos.edit_hook user, repo, hook_id, inputs.except(:config)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should edit the resource" do
         github.repos.edit_hook user, repo, hook_id, inputs
-        a_patch("/repos/#{user}/#{repo}/hooks/#{hook_id}").with(inputs).should have_been_made
+        a_patch("/repos/#{user}/#{repo}/hooks/#{hook_id}").
+          with(inputs).should have_been_made
       end
 
       it "should return resource" do
@@ -243,7 +251,6 @@ describe Github::Repos::Hooks, :type => :base do
         hook = github.repos.edit_hook user, repo, hook_id, inputs
         hook.name.should == 'web'
       end
-
     end
 
     context "failed to edit resource" do
@@ -330,7 +337,6 @@ describe Github::Repos::Hooks, :type => :base 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"})
-
       end
 
       it "should fail to find resource" do

data/spec/github/repos/keys_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
-describe Github::Repos::Keys, :type => :base do
+describe Github::Repos::Keys 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_KEY_PARAM_NAMES.should_not be_nil }
 
@@ -12,7 +17,6 @@ describe Github::Repos::Keys, :type => :base do
       end
 
       it "should fail to get resource without username" do
-        github.user, github.repo = nil, nil
         expect { github.repos.keys }.to raise_error(ArgumentError)
       end
 
@@ -45,7 +49,6 @@ describe Github::Repos::Keys, :type => :base do
         }.to raise_error(Github::Error::NotFound)
       end
     end
-
   end
 
   describe "get_key" do
@@ -100,13 +103,13 @@ describe Github::Repos::Keys, :type => :base do
       it "should fail to create resource if 'title' input is missing" do
         expect {
           github.repos.create_key(user, repo, :key => 'ssh-rsa AAA...')
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should fail to create resource if 'key' input is missing" do
         expect {
           github.repos.create_key(user, repo, :title => 'octocat@octomac')
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create the resource" do
@@ -168,7 +171,6 @@ describe Github::Repos::Keys, :type => :base do
         }.to raise_error(Github::Error::NotFound)
       end
     end
-
   end
 
   describe "delete_key" do

data/spec/github/repos/pub_sub_hubbub_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Github::Repos::PubSubHubbub do
-
   let(:github) { Github.new }
   let(:topic)  { "https://github.com/peter-murach/github/events/push"}
   let(:callback) { "github://campfire?subdomain=github&room=Commits&token=abc123" }
@@ -15,6 +14,8 @@ describe Github::Repos::PubSubHubbub do
     }
   }
 
+  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
+
   describe "subscribe" do
     context "success" do
       before do
@@ -23,10 +24,6 @@ describe Github::Repos::PubSubHubbub do
           to_return(:body => '', :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
-      after do
-        github.oauth_token = nil
-      end
-
       it "should subscribe to hub" do
         github.repos.subscribe topic, callback
         a_post("/hub?access_token=#{OAUTH_TOKEN}").with(hub_inputs).should have_been_made
@@ -46,7 +43,7 @@ describe Github::Repos::PubSubHubbub do
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end
+  end # subscribe
 
   describe "unsubscribe" do
     context "success" do
@@ -56,10 +53,6 @@ describe Github::Repos::PubSubHubbub do
           to_return(:body => '', :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
-      after do
-        github.oauth_token = nil
-      end
-
       it "should subscribe to hub" do
         github.repos.unsubscribe topic, callback
         a_post("/hub?access_token=#{OAUTH_TOKEN}").with(hub_inputs).should have_been_made
@@ -79,5 +72,5 @@ describe Github::Repos::PubSubHubbub do
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end
+  end # unsubscribe
 end # Github::Repos::PubSubHubbub

data/spec/github/repos/watching_spec.rb

@@ -2,7 +2,12 @@
 
 require 'spec_helper'
 
-describe Github::Repos::Watching, :type => :base do
+describe Github::Repos::Watching do
+  let(:github) { Github.new }
+  let(:user) { 'peter-murach' }
+  let(:repo) { 'github' }
+
+  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
 
   describe "watchers" do
     before do
@@ -12,7 +17,6 @@ describe Github::Repos::Watching, :type => :base do
     end
 
     it "should fail to get resource without username" do
-      github.user, github.repo = nil, nil
       expect { github.repos.watchers }.to raise_error(ArgumentError)
     end
 
@@ -56,19 +60,14 @@ describe Github::Repos::Watching, :type => :base do
     end
   end
 
-  describe ":watched:" do
-
+  describe "#watched" do
     context "if user unauthenticated" do
-      before do
-        github.oauth_token = nil
-        WebMock.reset!
-      end
+      before { github.oauth_token = nil }
 
       it "should fail to get resource without username " do
         stub_get("/user/watched").
           to_return(:body => fixture("repos/watched.json"), :status => 401, :headers => {})
         expect {
-          github.user = nil
           github.repos.watched
         }.to raise_error(Github::Error::Unauthorized)
       end
@@ -83,15 +82,13 @@ describe Github::Repos::Watching, :type => :base do
 
     context "if user authenticated" do
       before do
-        github.user = nil
         github.oauth_token = OAUTH_TOKEN
         stub_get("/user/watched").
           with(:query => {:access_token => OAUTH_TOKEN}).
           to_return(:body => fixture("repos/watched.json"), :status => 200, :headers => {})
       end
-      after do
-        github.oauth_token = nil
-      end
+
+      after { github.oauth_token = nil }
 
       it "should get the resources" do
         github.repos.watched
@@ -111,16 +108,12 @@ describe Github::Repos::Watching, :type => :base do
         watched.first.owner.login.should == 'octocat'
       end
     end
-  end
+  end # watched
 
   describe "watching?" do
-
     context "with username ane reponame passed" do
-
       context "this repo is being watched by the user"
         before do
-          github.oauth_token = nil
-          github.user = nil
           stub_get("/user/watched/#{user}/#{repo}").
             to_return(:body => "", :status => 404, :headers => {:user_agent => github.user_agent})
         end
@@ -136,7 +129,6 @@ describe Github::Repos::Watching, :type => :base do
         watching = github.repos.watching? user, repo
         watching.should be_true
       end
-
     end
 
     context "without username and reponame passed" do
@@ -144,24 +136,19 @@ describe Github::Repos::Watching, :type => :base do
         expect { github.repos.watching?(nil, nil) }.to raise_error(ArgumentError)
       end
     end
-  end
+  end # watching?
 
   describe "start_watching" do
-
     context "user authenticated" do
-
       context "with correct information" do
         before do
-          github.user, github.repo = nil, nil
           github.oauth_token = OAUTH_TOKEN
           stub_put("/user/watched/#{user}/#{repo}").
             with(:query => {:access_token => OAUTH_TOKEN}).
             to_return(:body => "", :status => 204, :headers => {})
         end
 
-        after do
-          github.oauth_token = nil # ensure authentication is reset
-        end
+        after { github.oauth_token = nil }
 
         it "should successfully watch a repo" do
           github.repos.start_watching(user, repo)
@@ -170,10 +157,6 @@ describe Github::Repos::Watching, :type => :base do
             should have_been_made
         end
       end
-
-      context "without correct information" do
-
-      end
     end
 
     context "user unauthenticated" do
@@ -186,12 +169,10 @@ describe Github::Repos::Watching, :type => :base do
         }.to raise_error(Github::Error::Unauthorized)
       end
     end
-  end
+  end # start_watching
 
   describe "stop_watching" do
-
     context "user authenticated" do
-
       context "with correct information" do
         before do
           github.user, github.repo = nil, nil
@@ -205,10 +186,6 @@ describe Github::Repos::Watching, :type => :base do
           a_delete("/user/watched/#{user}/#{repo}?access_token=#{OAUTH_TOKEN}").should have_been_made
         end
       end
-
-      context "without correct information" do
-
-      end
     end
 
     context "user unauthenticated" do
@@ -221,6 +198,6 @@ describe Github::Repos::Watching, :type => :base do
         }.to raise_error(Github::Error::Unauthorized)
       end
     end
-  end
+  end # stop_watching
 
 end # Github::Respos::Watching

data/spec/github/repos_spec.rb

@@ -1,25 +1,32 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-describe Github::Repos, :type => :base do
+describe Github::Repos do
+  let(:github) { Github.new }
+  let(:user) { 'peter-murach' }
+  let(:repo) { 'github' }
+
+  after { reset_authentication_for github }
 
   describe "branches" do
     context "resource found" do
       before do
         stub_get("/repos/#{user}/#{repo}/branches").
-          to_return(:body => fixture('repos/branches.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('repos/branches.json'),
+              :status => 200,
+              :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should raise error when no user/repo parameters" do
-        github.user, github.repo = nil, nil
         expect {
-          github.repos.branches
+          github.repos.branches nil, repo
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
-        github.user, github.repo = nil, nil
         expect {
-          github.repos.branches user
+          github.repos.branches user, nil
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
       end
 
@@ -40,8 +47,9 @@ describe Github::Repos, :type => :base do
       end
 
       it "should yield to a block" do
-        github.repos.should_receive(:branches).with(user, repo).and_yield('web')
-        github.repos.branches(user, repo) { |param| 'web'}
+        block = lambda { |el| repo }
+        github.repos.should_receive(:branches).with(user, repo).and_yield repo
+        github.repos.branches(user, repo, &block)
       end
     end
 
@@ -68,14 +76,12 @@ describe Github::Repos, :type => :base do
       end
 
       it "should raise error when no user/repo parameters" do
-        github.user, github.repo = nil, nil
         expect {
           github.repos.contributors
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
-        github.user, github.repo = nil, nil
         expect {
           github.repos.contributors user
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
@@ -123,20 +129,17 @@ describe Github::Repos, :type => :base do
 
     context "resource created successfully for the authenticated user" do
       before do
-        github.user = nil
         github.oauth_token = OAUTH_TOKEN
         stub_post("/user/repos?access_token=#{OAUTH_TOKEN}").with(inputs).
           to_return(:body => fixture('repos/repo.json'), :status => 201,: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 faile to create resource if 'name' inputs is missing" do
         expect {
           github.repos.create_repo inputs.except(:name)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource" do
@@ -195,7 +198,14 @@ describe Github::Repos, :type => :base do
   end
 
   describe "edit_repo" do
-    let(:inputs) { {:name => 'web', :description => "This is your first repo", :homepage => "https://github.com", :public => true, :has_issues => true, :has_wiki => true}}
+    let(:inputs) do
+      { :name => 'web',
+        :description => "This is your first repo",
+        :homepage => "https://github.com",
+        :public => true,
+        :has_issues => true,
+        :has_wiki => true }
+    end
 
     context "resource edited successfully" do
       before do
@@ -204,14 +214,14 @@ describe Github::Repos, :type => :base do
       end
 
       it "should fail to edit without 'user/repo' parameters" do
-        github.user, github.repo = nil, nil
+        # github.user, github.repo = nil, nil
         expect { github.repos.edit_repo }.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)
-        }.to raise_error(ArgumentError)
+        }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should edit the resource" do
@@ -228,14 +238,12 @@ describe Github::Repos, :type => :base do
         repository = github.repos.edit_repo user, repo, inputs
         repository.name.should == 'Hello-World'
       end
-
     end
 
     context "failed to edit resource" do
       before do
         stub_patch("/repos/#{user}/#{repo}").with(inputs).
           to_return(:body => fixture("repos/repo.json"), :status => 404, :headers => { :content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should fail to find resource" do
@@ -244,7 +252,6 @@ describe Github::Repos, :type => :base do
         }.to raise_error(Github::Error::NotFound)
       end
     end
-
   end # edit_repo
 
   describe "get_repo" do
@@ -295,7 +302,6 @@ describe Github::Repos, :type => :base do
           github.repos.get_repo user, repo
         }.to raise_error(Github::Error::NotFound)
       end
-
     end
   end # get_repo
 
@@ -307,14 +313,14 @@ describe Github::Repos, :type => :base do
       end
 
       it "should raise error when no user/repo parameters" do
-        github.user, github.repo = nil, nil
+        # github.user, github.repo = nil, nil
         expect {
           github.repos.languages
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
-        github.user, github.repo = nil, nil
+        # github.user, github.repo = nil, nil
         expect {
           github.repos.languages user
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
@@ -346,7 +352,6 @@ describe Github::Repos, :type => :base do
       before do
         stub_get("/repos/#{user}/#{repo}/languages").
           to_return(:body => '', :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should fail to get resource" do
@@ -360,7 +365,7 @@ describe Github::Repos, :type => :base do
   describe "repos" do
     context "resource found for authenticated user" do
       before do
-        github.user = nil
+        # github.user = nil
         github.oauth_token = OAUTH_TOKEN
         stub_get("/user/repos?access_token=#{OAUTH_TOKEN}").
           to_return(:body => fixture('repos/repos.json'), :status => 200,:headers => {:content_type => "application/json; charset=utf-8"} )
@@ -368,7 +373,7 @@ describe Github::Repos, :type => :base do
 
       after do
         github.oauth_token = nil
-        github.user, github.repo = nil, nil
+        # github.user, github.repo = nil, nil
       end
 
       it "fails if user is unauthenticated" do
@@ -404,7 +409,7 @@ describe Github::Repos, :type => :base do
       let(:org) { '37signals' }
 
       before do
-        github.user = nil
+        # github.user = nil
         github.oauth_token = nil
         stub_get("/orgs/#{org}/repos").
           to_return(:body => fixture('repos/repos.json'), :status => 200,:headers => {:content_type => "application/json; charset=utf-8"} )
@@ -431,16 +436,13 @@ describe Github::Repos, :type => :base do
 
     context "rosource not found for authenticated user" do
       before do
-        github.user = nil
+        # github.user = nil
         github.oauth_token = OAUTH_TOKEN
         stub_get("/user/repos?access_token=#{OAUTH_TOKEN}").
           to_return(:body => '', :status => 404,:headers => {:content_type => "application/json; charset=utf-8"} )
       end
 
-      after do
-        github.oauth_token = nil
-        github.user, github.repo = nil, nil
-      end
+      after { github.oauth_token = nil }
 
       it "fail to find resources" do
         expect { github.repos.repos }.to raise_error(Github::Error::NotFound)
@@ -456,14 +458,12 @@ describe Github::Repos, :type => :base do
       end
 
       it "should raise error when no user/repo parameters" do
-        github.user, github.repo = nil, nil
         expect {
           github.repos.tags
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
-        github.user, github.repo = nil, nil
         expect {
           github.repos.tags user
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
@@ -495,7 +495,6 @@ describe Github::Repos, :type => :base do
       before do
         stub_get("/repos/#{user}/#{repo}/tags").
           to_return(:body => fixture('repos/branches.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should fail to get resource" do
@@ -514,14 +513,12 @@ describe Github::Repos, :type => :base do
       end
 
       it "should raise error when no user/repo parameters" do
-        github.user, github.repo = nil, nil
         expect {
           github.repos.teams
         }.to raise_error(ArgumentError, /\[user\] parameter cannot be nil/)
       end
 
       it "should raise error when no repository" do
-        github.user, github.repo = nil, nil
         expect {
           github.repos.teams user
         }.to raise_error(ArgumentError, /\[repo\] parameter cannot be nil/)
@@ -553,7 +550,6 @@ describe Github::Repos, :type => :base do
       before do
         stub_get("/repos/#{user}/#{repo}/teams").
           to_return(:body => fixture('repos/teams.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-
       end
 
       it "should fail to get resource" do