Merge 6aeaccc into 8ad27b9

insightsengineering · Dec 14, 2023 · b9eec5d · b9eec5d
2 parents 8ad27b9 + 6aeaccc
commit b9eec5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/R/qenv-get_var.R b/R/qenv-get_var.R
@@ -28,7 +28,7 @@ setGeneric("get_var", function(object, var) {
 
 setMethod("get_var", signature = c("qenv", "character"), function(object, var) {
   tryCatch(
-    get(var, envir = object@env),
+    get(var, envir = object@env, inherits = FALSE),
     error = function(e) {
       message(conditionMessage(e))
       NULL

diff --git a/tests/testthat/test-qenv_get_var.R b/tests/testthat/test-qenv_get_var.R
@@ -24,3 +24,10 @@ testthat::test_that("get_var and `[[` return NULL if object not in qenv environm
   testthat::expect_null(q[["w"]])
   testthat::expect_message(q[["w"]], "object 'w' not found")
 })
+
+testthat::test_that("get_var and `[[` only returns objects from qenv, not parent environment(s)", {
+  q <- qenv()
+
+  testthat::expect_null(get_var(q, "iris"))
+  testthat::expect_null(q[["iris"]])
+})