@@ -389,8 +389,11 @@ func TestDo_rateLimit(t *testing.T) {
389389 }
390390
391391 req , _ := client .NewRequest ("GET" , "/" , nil )
392- client .Do (req , nil )
392+ _ , err := client .Do (req , nil )
393393
394+ if err != nil {
395+ t .Errorf ("Do returned unexpected error: %v" , err )
396+ }
394397 if got , want := client .Rate ().Limit , 60 ; got != want {
395398 t .Errorf ("Client rate limit = %v, want %v" , got , want )
396399 }
@@ -416,8 +419,14 @@ func TestDo_rateLimit_errorResponse(t *testing.T) {
416419 })
417420
418421 req , _ := client .NewRequest ("GET" , "/" , nil )
419- client .Do (req , nil )
422+ _ , err := client .Do (req , nil )
420423
424+ if err == nil {
425+ t .Error ("Expected error to be returned." )
426+ }
427+ if _ , ok := err .(* RateLimitError ); ok {
428+ t .Errorf ("Did not expect a *RateLimitError error; got %#v." , err )
429+ }
421430 if got , want := client .Rate ().Limit , 60 ; got != want {
422431 t .Errorf ("Client rate limit = %v, want %v" , got , want )
423432 }
@@ -430,6 +439,45 @@ func TestDo_rateLimit_errorResponse(t *testing.T) {
430439 }
431440}
432441
442+ // Ensure *RateLimitError is returned when API rate limit is exceeded.
443+ func TestDo_rateLimit_rateLimitError (t * testing.T ) {
444+ setup ()
445+ defer teardown ()
446+
447+ mux .HandleFunc ("/" , func (w http.ResponseWriter , r * http.Request ) {
448+ w .Header ().Add (headerRateLimit , "60" )
449+ w .Header ().Add (headerRateRemaining , "0" )
450+ w .Header ().Add (headerRateReset , "1372700873" )
451+ w .Header ().Set ("Content-Type" , "application/json; charset=utf-8" )
452+ w .WriteHeader (http .StatusForbidden )
453+ fmt .Fprintln (w , `{
454+ "message": "API rate limit exceeded for xxx.xxx.xxx.xxx. (But here's the good news: Authenticated requests get a higher rate limit. Check out the documentation for more details.)",
455+ "documentation_url": "https://developer.github.com/v3/#rate-limiting"
456+ }` )
457+ })
458+
459+ req , _ := client .NewRequest ("GET" , "/" , nil )
460+ _ , err := client .Do (req , nil )
461+
462+ if err == nil {
463+ t .Error ("Expected error to be returned." )
464+ }
465+ rateLimitErr , ok := err .(* RateLimitError )
466+ if ! ok {
467+ t .Fatalf ("Expected a *RateLimitError error; got %#v." , err )
468+ }
469+ if got , want := rateLimitErr .Rate .Limit , 60 ; got != want {
470+ t .Errorf ("rateLimitErr rate limit = %v, want %v" , got , want )
471+ }
472+ if got , want := rateLimitErr .Rate .Remaining , 0 ; got != want {
473+ t .Errorf ("rateLimitErr rate remaining = %v, want %v" , got , want )
474+ }
475+ reset := time .Date (2013 , 7 , 1 , 17 , 47 , 53 , 0 , time .UTC )
476+ if rateLimitErr .Rate .Reset .UTC () != reset {
477+ t .Errorf ("rateLimitErr rate reset = %v, want %v" , client .Rate ().Reset , reset )
478+ }
479+ }
480+
433481func TestDo_noContent (t * testing.T ) {
434482 setup ()
435483 defer teardown ()
0 commit comments