diff --git a/github/github.go b/github/github.go index 3c8cfb4..d4326d6 100644 --- a/github/github.go +++ b/github/github.go @@ -37,8 +37,6 @@ const ( // Media Type values to access preview APIs - // https://developer.github.com/changes/2014-08-05-team-memberships-api/ - mediaTypeMembershipPreview = "application/vnd.github.the-wasp-preview+json" ) // A Client manages communication with the GitHub API. diff --git a/github/orgs_members.go b/github/orgs_members.go index ae6f579..64dcfcc 100644 --- a/github/orgs_members.go +++ b/github/orgs_members.go @@ -171,9 +171,6 @@ func (s *OrganizationsService) ListOrgMemberships(opt *ListOrgMembershipsOptions return nil, nil, err } - // TODO: remove custom Accept header when this API fully launches - req.Header.Set("Accept", mediaTypeMembershipPreview) - var memberships []Membership resp, err := s.client.Do(req, &memberships) if err != nil { @@ -194,9 +191,6 @@ func (s *OrganizationsService) GetOrgMembership(org string) (*Membership, *Respo return nil, nil, err } - // TODO: remove custom Accept header when this API fully launches - req.Header.Set("Accept", mediaTypeMembershipPreview) - membership := new(Membership) resp, err := s.client.Do(req, membership) if err != nil { @@ -217,9 +211,6 @@ func (s *OrganizationsService) EditOrgMembership(org string, membership *Members return nil, nil, err } - // TODO: remove custom Accept header when this API fully launches - req.Header.Set("Accept", mediaTypeMembershipPreview) - m := new(Membership) resp, err := s.client.Do(req, m) if err != nil { diff --git a/github/orgs_members_test.go b/github/orgs_members_test.go index 85cb987..493488a 100644 --- a/github/orgs_members_test.go +++ b/github/orgs_members_test.go @@ -217,7 +217,6 @@ func TestOrganizationsService_ListOrgMemberships(t *testing.T) { mux.HandleFunc("/user/memberships/orgs", func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, "GET") - testHeader(t, r, "Accept", mediaTypeMembershipPreview) testFormValues(t, r, values{ "state": "active", "page": "2", @@ -246,7 +245,6 @@ func TestOrganizationsService_GetOrgMembership(t *testing.T) { mux.HandleFunc("/user/memberships/orgs/o", func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, "GET") - testHeader(t, r, "Accept", mediaTypeMembershipPreview) fmt.Fprint(w, `{"url":"u"}`) }) @@ -272,7 +270,6 @@ func TestOrganizationsService_EditOrgMembership(t *testing.T) { json.NewDecoder(r.Body).Decode(v) testMethod(t, r, "PATCH") - testHeader(t, r, "Accept", mediaTypeMembershipPreview) if !reflect.DeepEqual(v, input) { t.Errorf("Request body = %+v, want %+v", v, input) } diff --git a/github/orgs_teams.go b/github/orgs_teams.go index af9af41..dd01a7b 100644 --- a/github/orgs_teams.go +++ b/github/orgs_teams.go @@ -260,9 +260,6 @@ func (s *OrganizationsService) GetTeamMembership(team int, user string) (*Member return nil, nil, err } - // TODO: remove custom Accept header when this API fully launches - req.Header.Set("Accept", mediaTypeMembershipPreview) - t := new(Membership) resp, err := s.client.Do(req, t) if err != nil { @@ -297,9 +294,6 @@ func (s *OrganizationsService) AddTeamMembership(team int, user string) (*Member return nil, nil, err } - // TODO: remove custom Accept header when this API fully launches - req.Header.Set("Accept", mediaTypeMembershipPreview) - t := new(Membership) resp, err := s.client.Do(req, t) if err != nil { @@ -319,8 +313,5 @@ func (s *OrganizationsService) RemoveTeamMembership(team int, user string) (*Res return nil, err } - // TODO: remove custom Accept header when this API fully launches - req.Header.Set("Accept", mediaTypeMembershipPreview) - return s.client.Do(req, nil) } diff --git a/github/orgs_teams_test.go b/github/orgs_teams_test.go index 94df225..1b18b62 100644 --- a/github/orgs_teams_test.go +++ b/github/orgs_teams_test.go @@ -402,7 +402,6 @@ func TestOrganizationsService_GetTeamMembership(t *testing.T) { mux.HandleFunc("/teams/1/memberships/u", func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, "GET") - testHeader(t, r, "Accept", mediaTypeMembershipPreview) fmt.Fprint(w, `{"url":"u", "state":"active"}`) }) @@ -423,7 +422,6 @@ func TestOrganizationsService_AddTeamMembership(t *testing.T) { mux.HandleFunc("/teams/1/memberships/u", func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, "PUT") - testHeader(t, r, "Accept", mediaTypeMembershipPreview) fmt.Fprint(w, `{"url":"u", "state":"pending"}`) }) @@ -444,7 +442,6 @@ func TestOrganizationsService_RemoveTeamMembership(t *testing.T) { mux.HandleFunc("/teams/1/memberships/u", func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, "DELETE") - testHeader(t, r, "Accept", mediaTypeMembershipPreview) w.WriteHeader(http.StatusNoContent) })