conforming function calls (#209)

Author: digitalghost-dev

cmd/ability/ability.go

@@ -59,7 +59,8 @@ func AbilityCommand() (string, error) {
 
 	abilitiesStruct, abilityName, err := connections.AbilityApiCall(endpoint, abilityName, connections.APIURL)
 	if err != nil {
-		return err.Error(), nil
+		output.WriteString(err.Error())
+		return output.String(), err
 	}
 
 	// Extract English short_effect
@@ -102,7 +103,7 @@ func AbilityCommand() (string, error) {
 	if *pokemonFlag || *shortPokemonFlag {
 		if err := flags.PokemonAbilitiesFlag(&output, endpoint, abilityName); err != nil {
 			output.WriteString(fmt.Sprintf("error parsing flags: %v\n", err))
-			return "", fmt.Errorf("error parsing flags: %w", err)
+			return output.String(), fmt.Errorf("error parsing flags: %w", err)
 		}
 	}
 

cmd/item/item.go

@@ -50,11 +50,8 @@ func ItemCommand() (string, error) {
 
 	itemStruct, itemName, err := connections.ItemApiCall(endpoint, itemName, connections.APIURL)
 	if err != nil {
-		if os.Getenv("GO_TESTING") != "1" {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
-		}
-		return err.Error(), nil
+		output.WriteString(err.Error())
+		return output.String(), err
 	}
 
 	itemInfoContainer(&output, itemStruct, itemName)