get rid of success_msg again

r-lib · krlmlr · Feb 19, 2016 · Feb 5, 2016 · Feb 5, 2016 · Feb 5, 2016
commit 2b5c28c8f15b3ec5a9ed43c5ea063ea54d6b2b99
diff --git a/R/expectation.r b/R/expectation.r
@@ -46,7 +46,8 @@ update_expectation <- function(exp, srcref, info = NULL, label = NULL) {
     exp$failure_msg <- paste0(exp$failure_msg, "\n", info)
   }
 
-  exp$message <- if (exp$passed) exp$success_msg else exp$failure_msg
+  # TODO: Get rid of failure_msg in favor of message
+  exp$message <- exp$failure_msg
 
   exp
 }
@@ -72,6 +73,7 @@ as.expectation.logical <- function(x, message, ...) {
 as.expectation.error <- function(x, ...) {
   error <- x$message
   calls <- x$calls
+  # TODO: Collect srcref in test_code()
   srcref <- x$srcref
 
   msg <- gsub("Error.*?: ", "", as.character(error))