Skip to content

Fix #96 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
torfason merged 2 commits into from
Apr 10, 2025
Merged

Fix #96 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a2f2c6
Add test for conflicting import error #96
aramirezreyes Apr 10, 2025
db4d9f9
added conflicting name in error message #96
aramirezreyes Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion R/safe_assign.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ safe_assign <- function(x, value, pos = -1, envir = as.environment(pos), inherit
{
if (x %in% ls(envir, all.names = TRUE) &&
!identical(environment(envir[[x]]), environment(value)))
stop("Cannot assign name to different value in the given environment. Name already in use.",
stop(sprintf("Cannot assign name `%s` to different value in the given environment. Name already in use.",
x),
call. = FALSE)

assign(x, value, pos, envir, inherits)
Expand Down
8 changes: 8 additions & 0 deletions tests/test_import/test_from.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ test_that("Imports from modules work", {
cleanup_environment()
})

test_that("Conflicting imports throw error containing conflicting name", {
expect_error ( fun1() )
expect_silent( import::from(module_base.R, fun1) )
expect_error ( import::from(module_hidden_objects.R, fun1) )
expect_error ( import::from(module_hidden_objects.R, fun1), ".*fun1.*" )
cleanup_environment()
})

test_that("Subsequent imports from modules work", {
expect_error ( fun1() )
expect_error ( fun7() )
Expand Down