Merge branch 'main' into issue-269

R/type.R

@@ -118,7 +118,7 @@ xportr_type <- function(.df,
   }
 
   metacore <- metadata %>%
-    select(!!sym(variable_name), !!sym(type_name))
+    select(variable = !!sym(variable_name), type = !!sym(type_name))
 
   # Common check for multiple variables name
   check_multiple_var_specs(metadata, variable_name)
@@ -129,7 +129,7 @@ xportr_type <- function(.df,
   # Produces a data.frame with Variables, Type.x(Table), and Type.y(metadata)
   meta_ordered <- left_join(
     data.frame(variable = names(.df), type = unlist(table_cols_types)),
-    metadata,
+    metacore,
     by = "variable"
   ) %>%
     mutate(

tests/testthat/test-type.R

@@ -325,3 +325,23 @@ test_that("type Test 11: Works as expected with only one domain in metadata", {
 
   expect_equal(xportr_type(adsl, metadata), adsl)
 })
+
+# xportr_type ----
+## Test 12: xportr_type: xportr_options() overrides work properly ----
+test_that("type Test 12: xportr_options() overrides work properly", {
+  op <- options()
+
+  data("adsl_xportr", "var_spec", package = "xportr")
+  var_spec <- distinct(var_spec, Variable, .keep_all = TRUE) # quick fix because there's dups in the data
+
+  xportr_options(
+    xportr.variable_name = "Variable",
+    xportr.type_name = "Data Type"
+  )
+
+  expect_silent(
+    adsl_xportr %>% xportr_type(var_spec, "ADSL", "message")
+  )
+
+  options(op)
+})