GSK-Biostatistics · bzkrouse · Sep 22, 2024 · Oct 10, 2024 · Oct 10, 2024 · Oct 11, 2024
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: tfrmtbuilder
 Title: 'shiny' App Companion to the 'tfrmt' Package
-Version: 0.0.6.9000
+Version: 0.1.0
 Authors@R: 
   c(person(given = "Becca",
                     family = "Krouse",

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# tfrmtbuilder development version
+# tfrmtbuilder 0.1.0
 
 * New features:
   - Add ability to specify `tfrmt`, `data`, and/or `mockmode` in the `tfrmtbuilder()` function call, as an alternative to manually uploading/specifying these within the app.

diff --git a/cran-comments.md b/cran-comments.md
@@ -2,5 +2,3 @@
 
 0 errors | 0 warnings | 0 notes
 
-* This is a new release.
-
diff --git a/tests/testthat/_snaps/e2e-auto/tfrmt_save.json b/tests/testthat/_snaps/e2e-auto/tfrmt_save.json
@@ -0,0 +1,45 @@
+{
+  "group": ["group"],
+  "label": ["label"],
+  "param": ["param"],
+  "value": ["value"],
+  "column": ["column"],
+  "body_plan": [
+    {
+      "group_val": [".default"],
+      "label_val": [".default"],
+      "param_val": [".default"],
+      "frmt": {
+        "expression": ["xx.x"],
+        "missing": {},
+        "scientific": {},
+        "transform": {}
+      }
+    }
+  ],
+  "page_plan": {
+    "struct_list": [],
+    "note_loc": ["noprint"],
+    "max_rows": [60]
+  },
+  "row_grp_plan": {
+    "struct_list": [],
+    "label_loc": {
+      "location": ["indented"],
+      "indent": ["  "]
+    }
+  },
+  "col_style_plan": [],
+  "col_plan": {
+    "col_plan": {
+      "dots": [
+        ["group"],
+        ["label"],
+        ["column1"],
+        ["column2"],
+        ["column3"]
+      ],
+      ".drop": [true]
+    }
+  }
+}
diff --git a/tests/testthat/e2e/app.R b/tests/testthat/e2e/app.R
@@ -0,0 +1 @@
+tfrmtbuilder::tfrmtbuilder(run = FALSE)
diff --git a/tests/testthat/module_examples/mod_datamapping_inputs/app.R b/tests/testthat/module_examples/mod_datamapping_inputs/app.R
@@ -25,7 +25,7 @@ shinyApp(
     exportTestValues(
       settings = {vals$settings()},
       valid = {vals$valid()},
-      initial_state = {vals$initial_stat()}
+      state_counter = {vals$state_counter()}
     )
 
   }

diff --git a/tests/testthat/test-e2e-auto.R b/tests/testthat/test-e2e-auto.R
@@ -2,8 +2,8 @@ test_that("End to end with mock/auto mode (no data)", {
 
   skip_if_not(interactive())
 
-  tfrmtbuilder_app <- tfrmtbuilder(run = FALSE)
-  app <- shinytest2::AppDriver$new(tfrmtbuilder_app)
+  app_dir <- rprojroot::find_testthat_root_file("e2e")
+  app <- shinytest2::AppDriver$new(app_dir)
 
   # click export tab
   app$set_inputs(`tb-all_tabs` = "Export")
@@ -12,7 +12,7 @@ test_that("End to end with mock/auto mode (no data)", {
   expect_snapshot_file("tfrmt_save.json")
 
   app$get_download("tb-export-tbl_save_png", filename = "tfrmt_save.png")
-  expect_snapshot_file("tfrmt_save.png")
+  expect_true(file.exists("tfrmt_save.png"))
 
   file.remove("tfrmt_save.json")
   file.remove("tfrmt_save.png")

diff --git a/tests/testthat/test-mod_datamapping_inputs-shinytest2.R b/tests/testthat/test-mod_datamapping_inputs-shinytest2.R
@@ -13,7 +13,7 @@ test_that("Data-driven dropdowns produce expected results",{
 
   expect_equal(export_vals$settings, "grp")
   expect_equal(export_vals$valid, TRUE)
-  expect_equal(export_vals$initial_state, TRUE)
+  expect_equal(export_vals$state_counter, 1)
 
 
 # Change selection --------------------------------------------------------
@@ -25,7 +25,7 @@ test_that("Data-driven dropdowns produce expected results",{
 
   expect_equal(export_vals$settings, "rowlbl1")
   expect_equal(export_vals$valid, TRUE)
-  expect_equal(export_vals$initial_state, FALSE)
+  expect_equal(export_vals$state_counter, 2)
 
 
 # Deselect ----------------------------------------------------------------
@@ -37,7 +37,7 @@ test_that("Data-driven dropdowns produce expected results",{
 
   expect_equal(export_vals$settings, NULL)
   expect_equal(export_vals$valid, FALSE)
-  expect_equal(export_vals$initial_state, FALSE)
+  expect_equal(export_vals$state_counter, 3)
 
   app$stop()
 
@@ -71,7 +71,7 @@ test_that("Data-driven dropdowns can be added/removed",{
 
   expect_equal(export_vals$settings, c("grp","rowlbl2"))
   expect_equal(export_vals$valid, TRUE)
-  expect_equal(export_vals$initial_state, FALSE)
+  expect_gt(export_vals$state_counter, 0)
 
   # Add another input -------------------------------------------------------
 
@@ -88,7 +88,7 @@ test_that("Data-driven dropdowns can be added/removed",{
 
   expect_equal(export_vals$settings, c("grp","rowlbl2", "rowlbl1"))
   expect_equal(export_vals$valid, TRUE)
-  expect_equal(export_vals$initial_state, FALSE)
+  expect_gt(export_vals$state_counter, 0)
 
 
 # Remove input ------------------------------------------------------------
@@ -125,7 +125,7 @@ test_that("Data-driven dropdowns can be added/removed",{
 
   expect_equal(export_vals$settings, c("grp","rowlbl1"))
   expect_equal(export_vals$valid, TRUE)
-  expect_equal(export_vals$initial_state, FALSE)
+  expect_gt(export_vals$state_counter, 0)
 
   app$stop()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,3 @@

		0 errors \| 0 warnings \| 0 notes

		* This is a new release.