convert add_to_team to use new team membership API

FreeSchoolHackers · Oct 8, 2014 · 1367ee0 · 1367ee0
1 parent a6b9e77
commit 1367ee0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lib/teachers_pet/client_decorator.rb b/lib/teachers_pet/client_decorator.rb
@@ -51,7  51,8 @@ def add_users_to_team(organization, team, usernames)
           if team_members.include?(username)
             puts " -> @#{username} is already on @#{organization}/#{team[:name]}"
           else
-            self.add_team_member(team[:id], username)
             # https://github.com/octokit/octokit.rb/pull/518
             self.add_team_membership(team[:id], username, accept: 'application/vnd.github.the-wasp-preview json')
             puts " -> @#{username} has been added to @#{organization}/#{team[:name]}"
           end
         end

diff --git a/spec/commands/add_to_team_spec.rb b/spec/commands/add_to_team_spec.rb
@@ -21,7  21,7 @@
     ])
 
     users[1..-1].each do |instructor|
-      request_stubs << stub_request(:put, "https://testteacher:[email protected]/teams/101/members/#{instructor}")
       request_stubs << stub_request(:put, "https://testteacher:[email protected]/teams/101/memberships/#{instructor}")
     end
 
     teachers_pet(:add_to_team,

diff --git a/spec/commands/create_student_teams_spec.rb b/spec/commands/create_student_teams_spec.rb
@@ -32,7  32,7 @@ def stub_owners_only
       request_stubs << stub_get_json("https://testteacher:[email protected]/teams/#{i}/members?per_page=100", [])
 
       # Add student to their team
-      request_stubs << stub_request(:put, "https://testteacher:[email protected]/teams/#{i}/members/#{student}")
       request_stubs << stub_request(:put, "https://testteacher:[email protected]/teams/#{i}/memberships/#{student}")
     end
 
     teachers_pet(:create_student_teams,
@@ -70,7  70,7 @@ def stub_owners_only
 
     %w(teststudent1 teststudent2).each do |student|
       # Add student to their team
-      request_stubs << stub_request(:put, "https://testteacher:[email protected]/teams/1/members/#{student}")
       request_stubs << stub_request(:put, "https://testteacher:[email protected]/teams/1/memberships/#{student}")
     end
 
     teachers_pet(:create_student_teams,

diff --git a/teachers_pet.gemspec b/teachers_pet.gemspec
@@ -21,7  21,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
 
   s.add_dependency 'activesupport', '~> 4.0'
-  s.add_dependency 'octokit', '~> 3.1.0'
   # for team membership API
   # https://developer.github.com/changes/2014-08-05-team-memberships-api/
   s.add_dependency 'octokit', '~> 3.3.0'
   s.add_dependency 'require_all', '~> 1.3.2'
   s.add_dependency 'thor', '~> 0.19.1'