Merge pull request #52 from wjakethompson/final-leg

Surprise songs from the final leg
wjakethompson · Dec 18, 2024 · 3811a8f · 3811a8f
2 parents cf16d5e + 87032f3
commit 3811a8f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/data-raw/surprise-songs.R b/data-raw/surprise-songs.R
@@ -22,7 +22,9 @@ eras_tour_surprise <- read_xlsx(here("data-raw", "surprise-songs.xlsx")) %>%
    pivot_longer(cols = everything(), names_to = "type", values_to = "song") %>%
    filter(!is.na(song)) %>%
    filter(!(song %in% taylor_all_songs$track_name)) %>%
-   filter(song != "Thinking Out Loud"))
+   filter(!(song %in% c("Thinking Out Loud",
+                        "Espresso", "Please Please Please",
+                        "I Love You, I'm Sorry"))))
 
 # Check that we're using Taylor's Version when possible. Should be 0 rows.
 (not_tv <- eras_tour_surprise %>%

diff --git a/data-raw/surprise-songs.xlsx b/data-raw/surprise-songs.xlsx
diff --git a/data/eras_tour_surprise.rda b/data/eras_tour_surprise.rda
diff --git a/man/eras_tour_surprise.Rd b/man/eras_tour_surprise.Rd
diff --git a/tests/testthat/test-data.R b/tests/testthat/test-data.R
@@ -82,7 +82,10 @@ test_that("surprise songs are the correct version", {
   mashups <- unlist(strsplit(mashups, split = "; "))
 
   expect_true(all(c(songs, mashups) %in%
-                    c(taylor_all_songs$track_name, "Thinking Out Loud")))
+                    c(taylor_all_songs$track_name,
+                      "Thinking Out Loud",
+                      "Espresso", "Please Please Please",
+                      "I Love You, I'm Sorry")))
 
   no_tv_songs <- c(songs, mashups)[grep("Taylor's Version",
                                         eras_tour_surprise$song,