github_api 0.4.11 → 0.5.0.rc1

data/spec/github/orgs/members_spec.rb

@@ -5,123 +5,131 @@ describe Github::Orgs::Members do
   let(:member) { 'peter-murach' }
   let(:org)    { 'github' }
 
-  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
+  after { reset_authentication_for github }
+
+  describe "#list" do
+    it { github.orgs.members.should respond_to :all }
 
-  describe "members" do
     context "resource found" do
       before do
         stub_get("/orgs/#{org}/members").
-          to_return(:body => fixture('orgs/members.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/members.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without org name" do
-        expect { github.orgs.members }.to raise_error(ArgumentError)
+        expect { github.orgs.members.list nil }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.orgs.members org
+        github.orgs.members.list org
         a_get("/orgs/#{org}/members").should have_been_made
       end
 
       it "should return array of resources" do
-        members = github.orgs.members org
+        members = github.orgs.members.list org
         members.should be_an Array
         members.should have(1).items
       end
 
       it "should be a mash type" do
-        members = github.orgs.members org
+        members = github.orgs.members.list org
         members.first.should be_a Hashie::Mash
       end
 
       it "should get members information" do
-        members = github.orgs.members org
+        members = github.orgs.members.list org
         members.first.login.should == 'octocat'
       end
 
       it "should yield to a block" do
-        github.orgs.should_receive(:members).with(org).and_yield('web')
-        github.orgs.members(org) { |param| 'web' }
+        github.orgs.members.should_receive(:list).with(org).and_yield('web')
+        github.orgs.members.list(org) { |param| 'web' }
       end
     end
 
     context "resource not found" do
       before do
         stub_get("/orgs/#{org}/members").
-          to_return(:body => fixture('orgs/members.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/members.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.members org
+          github.orgs.members.list org
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # members
+  end # list
 
-  describe "member?" do
+  describe "#member?" do
     context "with username ane reponame passed" do
       context "this repo is being watched by the user"
         before do
           stub_get("/orgs/#{org}/members/#{member}").
-            to_return(:body => "", :status => 404, :headers => {:user_agent => github.user_agent})
+            to_return(:body => "", :status => 404,
+              :headers => {:user_agent => github.user_agent})
         end
 
       it "should return false if resource not found" do
-        membership = github.orgs.member? org, member
+        membership = github.orgs.members.member? org, member
         membership.should be_false
       end
 
       it "should return true if resoure found" do
           stub_get("/orgs/#{org}/members/#{member}").
             to_return(:body => "", :status => 204, :headers => {:user_agent => github.user_agent})
-        membership = github.orgs.member? org, member
+        membership = github.orgs.members.member? org, member
         membership.should be_true
       end
     end
 
     context "without org name and member name passed" do
       it "should fail validation " do
-        expect { github.orgs.member?(nil, nil) }.to raise_error(ArgumentError)
+        expect {
+          github.orgs.members.member?(nil, nil)
+        }.to raise_error(ArgumentError)
       end
     end
   end # member?
 
-  describe "public_members" do
+  describe "#list_public" do
     context "resource found" do
       before do
         stub_get("/orgs/#{org}/public_members").
-          to_return(:body => fixture('orgs/members.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/members.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without org name" do
-        expect { github.orgs.public_members }.to raise_error(ArgumentError)
+        expect { github.orgs.members.list_public }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.orgs.public_members org
+        github.orgs.members.list_public org
         a_get("/orgs/#{org}/public_members").should have_been_made
       end
 
       it "should return array of resources" do
-        public_members = github.orgs.public_members org
+        public_members = github.orgs.members.list_public org
         public_members.should be_an Array
         public_members.should have(1).items
       end
 
       it "should be a mash type" do
-        public_members = github.orgs.public_members org
+        public_members = github.orgs.members.list_public org
         public_members.first.should be_a Hashie::Mash
       end
 
       it "should get public_members information" do
-        public_members = github.orgs.public_members org
+        public_members = github.orgs.members.list_public org
         public_members.first.login.should == 'octocat'
       end
 
       it "should yield to a block" do
-        github.orgs.should_receive(:public_members).with(org).and_yield('web')
-        github.orgs.public_members(org) { |param| 'web' }
+        github.orgs.members.should_receive(:list_public).with(org).and_yield('web')
+        github.orgs.members.list_public(org) { |param| 'web' }
       end
     end
 
@@ -133,11 +141,11 @@ describe Github::Orgs::Members do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.public_members org
+          github.orgs.members.list_public org
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # public_members
+  end # list_public
 
   describe "public_member?" do
     context "with username ane reponame passed" do
@@ -148,21 +156,23 @@ describe Github::Orgs::Members do
         end
 
       it "should return false if resource not found" do
-        public_member = github.orgs.public_member? org, member
+        public_member = github.orgs.members.public_member? org, member
         public_member.should be_false
       end
 
       it "should return true if resoure found" do
           stub_get("/orgs/#{org}/public_members/#{member}").
             to_return(:body => "", :status => 204, :headers => {:user_agent => github.user_agent})
-        public_member = github.orgs.public_member? org, member
+        public_member = github.orgs.members.public_member? org, member
         public_member.should be_true
       end
     end
 
     context "without org name and member name passed" do
       it "should fail validation " do
-        expect { github.orgs.public_member?(nil, nil) }.to raise_error(ArgumentError)
+        expect {
+          github.orgs.members.public_member?(nil, nil)
+        }.to raise_error(ArgumentError)
       end
     end
   end # public_member?
@@ -175,11 +185,11 @@ describe Github::Orgs::Members do
       end
 
       it "should fail to get resource without org name" do
-        expect { github.orgs.publicize }.to raise_error(ArgumentError)
+        expect { github.orgs.members.publicize }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.orgs.publicize org, member
+        github.orgs.members.publicize org, member
         a_put("/orgs/#{org}/public_members/#{member}").should have_been_made
       end
     end
@@ -187,30 +197,34 @@ describe Github::Orgs::Members do
     context "resource not found" do
       before do
         stub_put("/orgs/#{org}/public_members/#{member}").
-          to_return(:body => fixture('orgs/members.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/members.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.publicize org, member
+          github.orgs.members.publicize org, member
         }.to raise_error(Github::Error::NotFound)
       end
     end
   end # publicize
 
-  describe "conceal" do
+  describe "#conceal" do
     context "request perfomed successfully" do
       before do
         stub_delete("/orgs/#{org}/public_members/#{member}").
-          to_return(:body => fixture('orgs/members.json'), :status => 204, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/members.json'), :status => 204,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without org name" do
-        expect { github.orgs.conceal nil, nil }.to raise_error(ArgumentError)
+        expect {
+          github.orgs.members.conceal nil, nil
+        }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.orgs.conceal org, member
+        github.orgs.members.conceal org, member
         a_delete("/orgs/#{org}/public_members/#{member}").should have_been_made
       end
     end
@@ -218,18 +232,19 @@ describe Github::Orgs::Members do
     context "resource not found" do
       before do
         stub_delete("/orgs/#{org}/public_members/#{member}").
-          to_return(:body => fixture('orgs/members.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/members.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.conceal org, member
+          github.orgs.members.conceal org, member
         }.to raise_error(Github::Error::NotFound)
       end
     end
   end # conceal
 
-  describe "delete_member" do
+  describe "#delete" do
     let(:hook_id) { 1 }
 
     context "resource deleted successfully" do
@@ -239,11 +254,11 @@ describe Github::Orgs::Members do
       end
 
       it "should fail to delete without org and member parameters" do
-        expect { github.repos.delete_hook nil, nil }.to raise_error(ArgumentError)
+        expect { github.orgs.members.delete nil, nil }.to raise_error(ArgumentError)
       end
 
       it "should delete the resource" do
-        github.orgs.delete_member org, member
+        github.orgs.members.delete org, member
         a_delete("/orgs/#{org}/members/#{member}").should have_been_made
       end
     end
@@ -251,16 +266,16 @@ describe Github::Orgs::Members do
     context "failed to edit resource" do
       before do
         stub_delete("/orgs/#{org}/members/#{member}").
-          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.orgs.delete_member org, member
+          github.orgs.members.delete org, member
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # delete_member
+  end # delete
 
 end # Github::Orgs::Members

data/spec/github/orgs/teams_spec.rb

@@ -8,84 +8,87 @@ describe Github::Orgs::Teams do
   let(:team)   { 'github' }
   let(:member) { 'github' }
 
-  after { github.user, github.repo, github.oauth_token = nil, nil, nil }
+  after { reset_authentication_for github }
 
-  describe "teams" do
+  describe "#list" do
     context "resource found" do
       before do
         stub_get("/orgs/#{org}/teams").
-          to_return(:body => fixture('orgs/teams.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/teams.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without org name" do
-        expect { github.orgs.teams nil }.to raise_error(ArgumentError)
+        expect { github.orgs.teams.list nil }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.orgs.teams org
+        github.orgs.teams.list org
         a_get("/orgs/#{org}/teams").should have_been_made
       end
 
       it "should return array of resources" do
-        teams = github.orgs.teams org
+        teams = github.orgs.teams.list org
         teams.should be_an Array
         teams.should have(1).items
       end
 
       it "should be a mash type" do
-        teams = github.orgs.teams org
+        teams = github.orgs.teams.list org
         teams.first.should be_a Hashie::Mash
       end
 
       it "should get teams information" do
-        teams = github.orgs.teams org
+        teams = github.orgs.teams.list org
         teams.first.name.should == 'Owners'
       end
 
       it "should yield to a block" do
-        github.orgs.should_receive(:teams).with(org).and_yield('web')
-        github.orgs.teams(org) { |param| 'web' }
+        github.orgs.teams.should_receive(:list).with(org).and_yield('web')
+        github.orgs.teams.list(org) { |param| 'web' }
       end
     end
 
     context "resource not found" do
       before do
         stub_get("/orgs/#{org}/teams").
-          to_return(:body => fixture('orgs/teams.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/teams.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.teams org
+          github.orgs.teams.list org
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # teams
+  end # list
 
-  describe "team" do
+  describe "#get" do
     context "resource found" do
       before do
         stub_get("/teams/#{team}").
-          to_return(:body => fixture('orgs/team.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/team.json'), :status => 200,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to get resource without org name" do
-        expect { github.orgs.team nil }.to raise_error(ArgumentError)
+        expect { github.orgs.teams.get nil }.to raise_error(ArgumentError)
       end
 
       it "should get the resource" do
-        github.orgs.team team
+        github.orgs.teams.get team
         a_get("/teams/#{team}").should have_been_made
       end
 
       it "should get team information" do
-        team_res = github.orgs.team team
+        team_res = github.orgs.teams.get team
         team_res.id.should == 1
         team_res.name.should == 'Owners'
       end
 
       it "should return mash" do
-        team_res = github.orgs.team team
+        team_res = github.orgs.teams.get team
         team_res.should be_a Hashie::Mash
       end
     end
@@ -93,18 +96,19 @@ describe Github::Orgs::Teams do
     context "resource not found" do
       before do
         stub_get("/teams/#{team}").
-          to_return(:body => fixture('orgs/team.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/team.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to retrive resource" do
         expect {
-          github.orgs.team team
+          github.orgs.teams.get team
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # team
+  end # get
 
-  describe "create_team" do
+  describe "#create" do
     let(:inputs) { { :name => 'new team', :permissions => 'push', :repo_names => [ 'github/dotfiles' ] }}
 
     context "resouce created" do
@@ -114,27 +118,27 @@ describe Github::Orgs::Teams do
       end
 
       it "should fail to create resource if 'org_name' param is missing" do
-        expect { github.orgs.create_team nil, inputs }.to raise_error(ArgumentError)
+        expect { github.orgs.teams.create nil, inputs }.to raise_error(ArgumentError)
       end
 
       it "should failt to create resource if 'name' input is missing" do
         expect {
-          github.orgs.create_team org, inputs.except(:name)
+          github.orgs.teams.create org, inputs.except(:name)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
-        github.orgs.create_team org, inputs
+        github.orgs.teams.create org, inputs
         a_post("/orgs/#{org}/teams").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        team = github.orgs.create_team org, inputs
+        team = github.orgs.teams.create org, inputs
         team.should be_a Hashie::Mash
       end
 
       it "should get the team information" do
-        team = github.orgs.create_team org, inputs
+        team = github.orgs.teams.create org, inputs
         team.name.should == 'Owners'
       end
     end
@@ -142,49 +146,50 @@ describe Github::Orgs::Teams do
     context "failed to create resource" do
       before do
         stub_post("/orgs/#{org}/teams").with(inputs).
-          to_return(:body => fixture('orgs/team.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/team.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should faile to retrieve resource" do
         expect {
-          github.orgs.create_team org, inputs
+          github.orgs.teams.create org, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # create_team
+  end # create
 
-  describe "edit_team" do
+  describe "#edit" do
     let(:inputs) { { :name => 'new team', :permissions => 'push' } }
 
     context "resouce edited" do
       before do
         stub_patch("/teams/#{team}").with(inputs).
-          to_return(:body => fixture('orgs/team.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-
+          to_return(:body => fixture('orgs/team.json'), :status => 201,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should fail to create resource if 'team name' param is missing" do
-        expect { github.orgs.edit_team nil, inputs }.to raise_error(ArgumentError)
+        expect { github.orgs.teams.edit nil, inputs }.to raise_error(ArgumentError)
       end
 
       it "should failt to create resource if 'name' input is missing" do
         expect {
-          github.orgs.edit_team team, inputs.except(:name)
+          github.orgs.teams.edit team, inputs.except(:name)
         }.to raise_error(Github::Error::RequiredParams)
       end
 
       it "should create resource successfully" do
-        github.orgs.edit_team team, inputs
+        github.orgs.teams.edit team, inputs
         a_patch("/teams/#{team}").with(inputs).should have_been_made
       end
 
       it "should return the resource" do
-        edited_team = github.orgs.edit_team team, inputs
+        edited_team = github.orgs.teams.edit team, inputs
         edited_team.should be_a Hashie::Mash
       end
 
       it "should get the team information" do
-        edited_team = github.orgs.edit_team team, inputs
+        edited_team = github.orgs.teams.edit team, inputs
         edited_team.name.should == 'Owners'
       end
     end
@@ -192,20 +197,23 @@ describe Github::Orgs::Teams do
     context "failed to create resource" do
       before do
         stub_patch("/teams/#{team}").with(inputs).
-          to_return(:body => fixture('orgs/team.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+          to_return(:body => fixture('orgs/team.json'), :status => 404,
+            :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "should faile to retrieve resource" do
         expect {
-          github.orgs.edit_team team, inputs
+          github.orgs.teams.edit team, inputs
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # edit_team
+  end # edit
 
-  describe "delete_team" do
+  describe "#delete" do
     let(:team_id) { 1 }
 
+    it { github.orgs.teams.should respond_to :remove }
+
     context "resource edited successfully" do
       before do
         stub_delete("/teams/#{team}").
@@ -213,12 +221,11 @@ describe Github::Orgs::Teams do
       end
 
       it "should fail to delete without 'team_id' parameter" do
-        github.user, github.repo = nil, nil
-        expect { github.orgs.delete_team }.to raise_error(ArgumentError)
+        expect { github.orgs.teams.delete nil }.to raise_error(ArgumentError)
       end
 
       it "should delete the resource" do
-        github.orgs.delete_team team
+        github.orgs.teams.delete team
         a_delete("/teams/#{team}").should have_been_made
       end
     end
@@ -230,12 +237,14 @@ describe Github::Orgs::Teams do
       end
 
       it "should fail to find resource" do
-        expect { github.orgs.delete_team team }.to raise_error(Github::Error::NotFound)
+        expect {
+          github.orgs.teams.delete team
+        }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # delete_team
+  end # delete
 
-  describe "team_members" do
+  describe "#list_members" do
     context "resource found" do
       before do
         stub_get("/teams/#{team}/members").
@@ -243,33 +252,33 @@ describe Github::Orgs::Teams do
       end
 
       it "should fail to get resource without org name" do
-        expect { github.orgs.team_members }.to raise_error(ArgumentError)
+        expect { github.orgs.teams.list_members }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.orgs.team_members team
+        github.orgs.teams.list_members team
         a_get("/teams/#{team}/members").should have_been_made
       end
 
       it "should return array of resources" do
-        teams = github.orgs.team_members team
+        teams = github.orgs.teams.list_members team
         teams.should be_an Array
         teams.should have(1).items
       end
 
       it "should be a mash type" do
-        teams = github.orgs.team_members team
+        teams = github.orgs.teams.list_members team
         teams.first.should be_a Hashie::Mash
       end
 
       it "should get team members information" do
-        teams = github.orgs.team_members team
+        teams = github.orgs.teams.list_members team
         teams.first.name.should == 'Owners'
       end
 
       it "should yield to a block" do
-        github.orgs.should_receive(:team_members).with(team).and_yield('web')
-        github.orgs.team_members(team) { |param| 'web' }
+        github.orgs.teams.should_receive(:list_members).with(team).and_yield('web')
+        github.orgs.teams.list_members(team) { |param| 'web' }
       end
     end
 
@@ -281,11 +290,11 @@ describe Github::Orgs::Teams do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.team_members team
+          github.orgs.teams.list_members team
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # team_members
+  end # list_members
 
   describe "team_member?" do
     context "with teamname ane membername passed" do
@@ -297,14 +306,14 @@ describe Github::Orgs::Teams do
         end
 
       it "should return false if resource not found" do
-        team_membership = github.orgs.team_member? team, member
+        team_membership = github.orgs.teams.team_member? team, member
         team_membership.should be_false
       end
 
       it "should return true if resoure found" do
         stub_get("/teams/#{team}/members/#{member}").
           to_return(:body => "", :status => 204, :headers => {:user_agent => github.user_agent})
-        team_membership = github.orgs.team_member? team, member
+        team_membership = github.orgs.teams.team_member? team, member
         team_membership.should be_true
       end
 
@@ -312,12 +321,14 @@ describe Github::Orgs::Teams do
 
     context "without org name and member name passed" do
       it "should fail validation " do
-        expect { github.orgs.team_member?(nil, nil) }.to raise_error(ArgumentError)
+        expect {
+          github.orgs.teams.team_member?(nil, nil)
+        }.to raise_error(ArgumentError)
       end
     end
-  end # member?
+  end # team_member?
 
-  describe "add_team_member" do
+  describe "#add_member" do
     context "resouce added" do
       before do
         stub_put("/teams/#{team}/members/#{member}").
@@ -326,18 +337,18 @@ describe Github::Orgs::Teams do
 
       it "should fail to add resource if 'team' input is nil" do
         expect {
-          github.orgs.add_team_member nil, member
+          github.orgs.teams.add_member nil, member
         }.to raise_error(ArgumentError)
       end
 
       it "should fail to add resource if 'member' input is nil" do
         expect {
-          github.orgs.add_team_member team, nil
+          github.orgs.teams.add_member team, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should add resource successfully" do
-        github.orgs.add_team_member team, member
+        github.orgs.teams.add_member team, member
         a_put("/teams/#{team}/members/#{member}").should have_been_made
       end
     end
@@ -350,13 +361,13 @@ describe Github::Orgs::Teams do
 
       it "should fail to add resource" do
         expect {
-          github.orgs.add_team_member team, member
+          github.orgs.teams.add_member team, member
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # add_team_member
+  end # add_member
 
-  describe "remove_team_member" do
+  describe "#remove_member" do
     context "resouce deleted" do
       before do
         stub_delete("/teams/#{team}/members/#{member}").
@@ -365,18 +376,18 @@ describe Github::Orgs::Teams do
 
       it "should fail to delete resource if 'team' input is nil" do
         expect {
-          github.orgs.remove_team_member nil, member
+          github.orgs.teams.remove_member nil, member
         }.to raise_error(ArgumentError)
       end
 
       it "should fail to delete resource if 'member' input is nil" do
         expect {
-          github.orgs.remove_team_member member, nil
+          github.orgs.teams.remove_member member, nil
         }.to raise_error(ArgumentError)
       end
 
       it "should add resource successfully" do
-        github.orgs.remove_team_member team, member
+        github.orgs.teams.remove_member team, member
         a_delete("/teams/#{team}/members/#{member}").should have_been_made
       end
     end
@@ -389,13 +400,13 @@ describe Github::Orgs::Teams do
 
       it "should fail to remove resource" do
         expect {
-          github.orgs.remove_team_member team, member
+          github.orgs.teams.remove_member team, member
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # remove_team_member
+  end # remove_member
 
-  describe "team_repos" do
+  describe "#list_repos" do
     context "resource found" do
       before do
         stub_get("/teams/#{team}/repos").
@@ -403,33 +414,33 @@ describe Github::Orgs::Teams do
       end
 
       it "should fail to get resource without team name" do
-        expect { github.orgs.team_repos nil }.to raise_error(ArgumentError)
+        expect { github.orgs.teams.list_repos nil }.to raise_error(ArgumentError)
       end
 
       it "should get the resources" do
-        github.orgs.team_repos team
+        github.orgs.teams.list_repos team
         a_get("/teams/#{team}/repos").should have_been_made
       end
 
       it "should return array of resources" do
-        team_repos = github.orgs.team_repos team
+        team_repos = github.orgs.teams.list_repos team
         team_repos.should be_an Array
         team_repos.should have(1).items
       end
 
       it "should be a mash type" do
-        team_repos = github.orgs.team_repos team
+        team_repos = github.orgs.teams.list_repos team
         team_repos.first.should be_a Hashie::Mash
       end
 
       it "should get teams information" do
-        team_repos = github.orgs.team_repos team
+        team_repos = github.orgs.teams.list_repos team
         team_repos.first.name.should == 'github'
       end
 
       it "should yield to a block" do
-        github.orgs.should_receive(:team_repos).with(team).and_yield('web')
-        github.orgs.team_repos(team) { |param| 'web' }
+        github.orgs.teams.should_receive(:list_repos).with(team).and_yield('web')
+        github.orgs.teams.list_repos(team) { |param| 'web' }
       end
     end
 
@@ -441,44 +452,44 @@ describe Github::Orgs::Teams do
 
       it "should return 404 with a message 'Not Found'" do
         expect {
-          github.orgs.team_repos team
+          github.orgs.teams.list_repos team
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # team_repos
+  end # list_repos
 
   describe "team_repo?" do
     context "with teamname, username ane reponame passed" do
 
       context "this repo is managed by the team"
         before do
-          github.oauth_token = nil
-          github.user = nil
           stub_get("/teams/#{team}/repos/#{user}/#{repo}").
             to_return(:body => "", :status => 404, :headers => {:user_agent => github.user_agent})
         end
 
       it "should return false if resource not found" do
-        team_managed = github.orgs.team_repo? team, user, repo
+        team_managed = github.orgs.teams.team_repo? team, user, repo
         team_managed.should be_false
       end
 
       it "should return true if resoure found" do
         stub_get("/teams/#{team}/repos/#{user}/#{repo}").
           to_return(:body => "", :status => 204, :headers => {:user_agent => github.user_agent})
-        team_managed = github.orgs.team_repo? team, user, repo
+        team_managed = github.orgs.teams.team_repo? team, user, repo
         team_managed.should be_true
       end
     end
 
     context "without org name and member name passed" do
       it "should fail validation " do
-        expect { github.orgs.team_repo?(nil, nil, nil) }.to raise_error(ArgumentError)
+        expect {
+          github.orgs.teams.team_repo?(nil, nil, nil)
+        }.to raise_error(ArgumentError)
       end
     end
   end # team_repo?
 
-  describe "add_team_repo" do
+  describe "#add_repo" do
     context "resouce added" do
       before do
         stub_put("/teams/#{team}/repos/#{user}/#{repo}").
@@ -487,18 +498,18 @@ describe Github::Orgs::Teams do
 
       it "should fail to add resource if 'team' input is nil" do
         expect {
-          github.orgs.add_team_member nil, user, repo
+          github.orgs.teams.add_repo nil, user, repo
         }.to raise_error(ArgumentError)
       end
 
       it "should fail to add resource if 'user' input is nil" do
         expect {
-          github.orgs.add_team_member team, nil, repo
+          github.orgs.teams.add_repo team, nil, repo
         }.to raise_error(ArgumentError)
       end
 
       it "should add resource successfully" do
-        github.orgs.add_team_repo team, user, repo
+        github.orgs.teams.add_repo team, user, repo
         a_put("/teams/#{team}/repos/#{user}/#{repo}").should have_been_made
       end
     end
@@ -511,13 +522,13 @@ describe Github::Orgs::Teams do
 
       it "should fail to add resource" do
         expect {
-          github.orgs.add_team_repo team, user, repo
+          github.orgs.teams.add_repo team, user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # add_team_repo
+  end # add_repo
 
-  describe "remove_team_member" do
+  describe "#remove_repo" do
     context "resouce deleted" do
       before do
         stub_delete("/teams/#{team}/repos/#{user}/#{repo}").
@@ -526,18 +537,18 @@ describe Github::Orgs::Teams do
 
       it "should fail to delete resource if 'team' input is nil" do
         expect {
-          github.orgs.remove_team_repo nil, user, repo
+          github.orgs.teams.remove_repo nil, user, repo
         }.to raise_error(ArgumentError)
       end
 
       it "should fail to delete resource if 'user' input is nil" do
         expect {
-          github.orgs.remove_team_repo team, nil, repo
+          github.orgs.teams.remove_repo team, nil, repo
         }.to raise_error(ArgumentError)
       end
 
       it "should add resource successfully" do
-        github.orgs.remove_team_repo team, user, repo
+        github.orgs.teams.remove_repo team, user, repo
         a_delete("/teams/#{team}/repos/#{user}/#{repo}").should have_been_made
       end
     end
@@ -550,10 +561,10 @@ describe Github::Orgs::Teams do
 
       it "should fail to remove resource" do
         expect {
-          github.orgs.remove_team_repo team, user, repo
+          github.orgs.teams.remove_repo team, user, repo
         }.to raise_error(Github::Error::NotFound)
       end
     end
-  end # remove_team_repo
+  end # remove_repo
 
 end # Github::Orgs::Teams