Merge branch 'feature/methods' into feature/error-in-message

R/mock.R

@@ -32,8 +32,10 @@
 #'   expect_equal(x <- 3 * 3, 6),
 #'   expect_identical(x + 4, 9)
 #' )
-#' throws_error()(expect_equal(3, 5))
-#' throws_error()(expect_identical(3, 5))
+#' \dontrun{
+#' expect_equal(3, 5)
+#' expect_identical(3, 5)
+#' }
 with_mock <- function(..., .env = topenv()) {
   new_values <- eval(substitute(alist(...)))
   mock_qual_names <- names(new_values)

R/reporter-list.R

@@ -2,7 +2,7 @@
 NULL
 
 
-setOldClass('proc_time')
+methods::setOldClass('proc_time')
 
 #' List reporter: gather all test results along with elapsed time and
 #' file information.

R/utils.R

@@ -43,7 +43,7 @@ show_stack <- function(star = integer(), n = sys.nframe() - 1L) {
 }
 
 env_name <- function(x) {
-  str <- capture.output(print(x))
+  str <- utils::capture.output(print(x))
   gsub("<environment: |>", "", str)
 }