diff --git a/R/compliments.R b/R/compliments.R index e0066f2..0bdf70e 100644 --- a/R/compliments.R +++ b/R/compliments.R @@ -9,7 +9,7 @@ #' @export really_pretty <- function(name, follow_up = TRUE) { - compliment <- glue::glue("You're, like, really pretty, {name}.") + compliment <- glue::glue("You're, like, really pretty {name}.") if (follow_up) { compliment <- paste(compliment, diff --git a/R/give_candygrams.R b/R/give_candygrams.R index 8d71397..4a983ec 100644 --- a/R/give_candygrams.R +++ b/R/give_candygrams.R @@ -30,7 +30,7 @@ give_candygrams <- function(person, number, number <- str_to_title(as.english(number)) - glue::glue("{number} for {person}.") + glue::glue("{number} for {person}.{extra_message}") diff --git a/README.md b/README.md index 876c029..f06cad8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ # meangirls - The goal of meangirls is to create quotes in the style of the 2004 @@ -92,7 +91,7 @@ You can also give extra commentary to your announcement: ``` r give_candygrams("Taylor Zimmerman", 2, extra_message = "Merry Christmas!") -#> Two for Taylor Zimmerman. +#> Two for Taylor Zimmerman. Merry Christmas! ``` Some special cases trigger automatic extra commentary or special @@ -100,10 +99,10 @@ behavior: ``` r give_candygrams("Glen Coco", 4) -#> Four for Glen Coco. +#> Four for Glen Coco. You go, Glen Coco! ``` ``` r give_candygrams("Gretchen Weiners", 4) -#> [1] "None for Grethen Weiners." +#> None for Gretchen Weiners. ``` diff --git a/tests/testthat/test-compliments.R b/tests/testthat/test-compliments.R index dfa3360..447e8a2 100644 --- a/tests/testthat/test-compliments.R +++ b/tests/testthat/test-compliments.R @@ -2,7 +2,7 @@ test_that("really_pretty works", { correct_result <- "You're, like, really pretty Cady." - my_result <- really_pretty("Cady") + my_result <- really_pretty("Cady",follow_up = FALSE) expect_equal(my_result, correct_result) })