Merge branch 'issue-25': Further tweaks to error message plus add a test

gavinsimpson · Feb 11, 2019 · 245ac45 · 245ac45
2 parents e4e75a4 + ac05019
commit 245ac45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/R/evaluate_smooth.R b/R/evaluate_smooth.R
@@ -67,7 +67,7 @@
     }
     smooth_ids <- which_smooth(object, smooth) # which smooths match 'smooth'
     if (identical(length(smooth_ids), 0L)) {
-        stop("Request smooth not found in the model <", smooth, ">", call. = FALSE)
+        stop("Requested smooth '", smooth, "' not found", call. = FALSE)
     }
     smooth_labels <- select_smooth(object, smooth)
 

diff --git a/tests/testthat/test-evaluate-smooth-methods.R b/tests/testthat/test-evaluate-smooth-methods.R
@@ -26,6 +26,12 @@ test_that("evaluate_smooth throws a message with more than one term", {
                    "Supplied more than 1 'smooth'; using only the first")
 })
 
+test_that("evaluate_smooth throws error if smooth not found", {
+    expect_error(evaluate_smooth(m1, smooth = "s(z)"),
+                 "Requested smooth 's(z)' not found",
+                 fixed = TRUE)
+})
+
 test_that("evaluate_smooth works for a GAMM", {
     sm <- evaluate_smooth(m2, "s(x2)")
     expect_is(sm, "evaluated_1d_smooth")