filter_desc supports selecting describe(desc0, { it(desc1) {...} }by desc0&&&desc1

Author: kubajal

R/source.R

@@ -61,39 +61,56 @@ source_file <- function(path,
 }
 
 filter_desc <- function(exprs, desc = NULL, error_call = caller_env()) {
-  if (is.null(desc)) {
-    return(exprs)
-  }
-
-  found <- FALSE
-  include <- rep(FALSE, length(exprs))
-
-  for (i in seq_along(exprs)) {
-    expr <- exprs[[i]]
-
-    if (!is_call(expr, c("test_that", "describe"), n = 2)) {
-      if (!found) {
-        include[[i]] <- TRUE
+  if (is.null(desc)) return(exprs)
+
+  desc_levels <- strsplit(desc, "&&&", fixed = TRUE)[[1]]
+  match_count <- 0
+  include <- logical(length(exprs))
+
+  find_matching_expr <- function(current_exprs, remaining_levels) {
+    for (i in seq_along(current_exprs)) {
+      current_expr <- current_exprs[[i]]
+
+      if (is_call(current_expr, c("test_that", "describe", "it"), n = 2)) {
+        expr_desc <- as.character(current_expr[[2]])
+
+        if (expr_desc == remaining_levels[1]) {
+          if (length(remaining_levels) == 1) {
+            match_count <<- match_count + 1
+            include[i] <<- TRUE
+          } else if (is_call(current_expr, "describe", n = 2)) {
+            body_of_expr <- as.list(current_expr[[3]])[-1]
+
+            previous_include <- include
+            previous_match_count <- match_count
+
+            include <<- logical(length(body_of_expr))
+            find_matching_expr(body_of_expr, remaining_levels[-1])
+
+            if (match_count > previous_match_count) {
+              current_expr[[3]][-1] <- body_of_expr[include]
+              current_exprs[[i]] <<- current_expr
+              include <<- previous_include
+              include[i] <<- TRUE
+            } else {
+              include <<- previous_include
+            }
+          }
+        }
+      } else if (match_count == 0 && !is_call(current_expr, c("test_that", "describe"))) {
+        include[i] <<- TRUE
       }
-    } else {
-      if (!is_string(expr[[2]]))
-        next
-
-      test_desc <- as.character(expr[[2]])
-      if (test_desc != desc)
-        next
-
-      if (found) {
-        abort("Found multiple tests with specified description", call = error_call)
-      }
-      include[[i]] <- TRUE
-      found <- TRUE
     }
   }
 
-  if (!found) {
+  find_matching_expr(exprs, desc_levels)
+
+  if (match_count == 0) {
     abort("Failed to find test with specified description", call = error_call)
   }
+  if (match_count > 1) {
+    abort("Found multiple tests with specified description", call = error_call)
+  }
 
   exprs[include]
 }

tests/testthat/test-source.R

@@ -82,3 +82,23 @@ test_that("errors if duplicate labels", {
 
   expect_snapshot(filter_desc(code, "baz"), error = TRUE)
 })
+
+test_that("filters nested tests with '&&&' syntax correctly", {
+  code <- exprs(
+    f(),
+    describe("level 0", {
+      it("level 1 A", {}),
+      it("level 1 B", {})
+    }),
+    g()
+  )
+
+  expected <- exprs(
+    f(),
+    describe("level 0", {
+      it("level 1 A", {})
+    })
+  )
+
+  expect_equal(filter_desc(code, "level 0&&&level 1 A"), expected)
+})