Update testthat and remove deprecated context calls

HammadTheOne · HammadTheOne · commit aff9b99aabd8 · 2021-10-07T15:23:47.000-04:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -25,7 +25,7 @@ Imports:
   rlang,
   utils
 Suggests:
-  testthat,
+  testthat (>= 3.1.0),
   rstudioapi
 License: MIT + file LICENSE
 Encoding: UTF-8
diff --git a/tests/testthat/test-attributes.R b/tests/testthat/test-attributes.R
@@ -1,5 +1,3 @@
-context("attributes")
-
 test_that("stylesheets can be added with or without attributes", {
   stylesheet_pattern <- '^.*<link href="(https.*)">.*$'
   script_pattern <- '^.*<script src="(https.*)">.*$'
diff --git a/tests/testthat/test-callback.R b/tests/testthat/test-callback.R
@@ -1,5 +1,3 @@
-context("callback")
-
 test_that("Callback outputs can be provided with or without output function", {
 
   app <- Dash$new()
@@ -14,7 +12,7 @@ test_that("Callback outputs can be provided with or without output function", {
       )
     )
   )
-  
+
   expect_silent(
     app$callback(output(id = 'output-state', property = 'children'),
                  list(input(id = 'submit-button', property = 'n_clicks'),
@@ -24,7 +22,7 @@ test_that("Callback outputs can be provided with or without output function", {
                    sprintf("The Button has been pressed \"%s\" times, Input 1 is \"%s\", and Input 2 is \"%s\"", n_clicks, input1, input2)
                  })
   )
-  
+
   expect_silent(
     app$callback(output=list(id = 'output-state', property = 'children'),
                  list(input(id = 'submit-button', property = 'n_clicks'),
@@ -37,9 +35,9 @@ test_that("Callback outputs can be provided with or without output function", {
 })
 
 test_that("Repeating outputs across callbacks yields an error", {
-  
+
   app <- Dash$new()
-  
+
   app$layout(
     htmlDiv(
       list(
@@ -54,7 +52,7 @@ test_that("Repeating outputs across callbacks yields an error", {
       )
     )
   )
-  
+
   app$callback(list(output(id = 'output-state', property = 'children'),
                     output(id = 'output-two', property = 'children')),
                list(input(id = 'submit-button', property = 'n_clicks'),
@@ -63,7 +61,7 @@ test_that("Repeating outputs across callbacks yields an error", {
                function(n_clicks, input1, input2) {
                  sprintf("The Button has been pressed \"%s\" times, Input 1 is \"%s\", and Input 2 is \"%s\"", n_clicks, input1, input2)
                })
-    
+
   expect_error(
     app$callback(list(output(id = 'output-state', property = 'children'),
                       output(id = 'output-three', property = 'children')),
diff --git a/tests/testthat/test-components.R b/tests/testthat/test-components.R
@@ -1,5 +1,3 @@
-context("components")
-
 test_that("Components work recursively (components can be children of components)", {
 
   # div inside a div
@@ -75,7 +73,7 @@ test_that("wildcard attributes work with children", {
 
 # test_that("Can translate arbitrary HTML string", {
 #   skip_if_not_installed("dashDangerouslySetInnerHtml")
-# 
+#
 #   html <- "<div> 1 </div>"
 #   expect_is(
 #     dashDangerouslySetInnerHtml::DangerouslySetInnerHTML(HTML(html)),
diff --git a/tests/testthat/test-dash.R b/tests/testthat/test-dash.R
@@ -1,5 +1,3 @@
-context("dash-api")
-
 test_that("Can access fiery server within a dash app", {
 
   d <- Dash$new()
diff --git a/tests/testthat/test-index.R b/tests/testthat/test-index.R
@@ -1,5 +1,3 @@
-context("customindex")
-
 test_that("Omitting required template keys produces warnings", {
   string <-
     "<!DOCTYPE html>
@@ -18,24 +16,24 @@ test_that("Omitting required template keys produces warnings", {
   </footer>
   </body>
   </html>"
-  
+
   app <- Dash$new()
-  
+
   expect_error(
     app$index_string(gsub("\\{\\%config\\%\\}|\\{\\%scripts\\%\\}|\\{\\%app_entry\\%\\}", "", string)),
     "Did you forget to include app_entry, config, scripts in your index string?"
   )
-  
+
   expect_error(
     app$index_string(gsub("\\{\\%scripts\\%\\}", "", string)),
     "Did you forget to include scripts in your index string?"
   )
-  
+
   expect_error(
     app$index_string(gsub("\\{\\%app_entry\\%\\}", "", string)),
     "Did you forget to include app_entry in your index string?"
   )
-  
+
   expect_error(
     app$index_string(gsub("\\{\\%config\\%\\}", "", string)),
     "Did you forget to include config in your index string?"
diff --git a/tests/testthat/test-layout.R b/tests/testthat/test-layout.R
@@ -1,5 +1,3 @@
-context("layout")
-
 test_that("layout IDs must be unique", {
 
  app <- Dash$new()
diff --git a/tests/testthat/test-routes.R b/tests/testthat/test-routes.R
@@ -1,5 +1,3 @@
-context("routes")
-
 test_that("URLs are properly redirected with app$redirect", {
  app <- Dash$new()
 
diff --git a/tests/testthat/test-tags.R b/tests/testthat/test-tags.R
@@ -1,5 +1,3 @@
-context("tags")
-
 test_that("Tag basics", {
   expect_identical(div("a", "b"), htmlDiv(list("a", "b")))
   expect_identical(div("a", "b", 5), htmlDiv(list("a", "b", 5)))
diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -1,5 +1,3 @@
-context("utils")
-
 test_that("remove_empty", {
   expect_error(remove_empty())
   expect_null(remove_empty(NULL))
diff --git a/tests/testthat/test-wildcards.R b/tests/testthat/test-wildcards.R
@@ -1,5 +1,3 @@
-context("wildcards")
-
 test_that("HTML `data-*` & `aria-* ` wildcards work", {
   x <- htmlDiv(`data-foo` = 1)
   expect_equal(x$props$`data-foo`, 1)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("attributes")`
`2`		`-`
`3`	`1`	`test_that("stylesheets can be added with or without attributes", {`
`4`	`2`	`stylesheet_pattern <- '^.<link href="(https.)">.*$'`
`5`	`3`	`script_pattern <- '^.<script src="(https.)">.*$'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("dash-api")`
`2`		`-`
`3`	`1`	`test_that("Can access fiery server within a dash app", {`
`4`	`2`
`5`	`3`	`d <- Dash$new()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("layout")`
`2`		`-`
`3`	`1`	`test_that("layout IDs must be unique", {`
`4`	`2`
`5`	`3`	`app <- Dash$new()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("routes")`
`2`		`-`
`3`	`1`	`test_that("URLs are properly redirected with app$redirect", {`
`4`	`2`	`app <- Dash$new()`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("tags")`
`2`		`-`
`3`	`1`	`test_that("Tag basics", {`
`4`	`2`	`expect_identical(div("a", "b"), htmlDiv(list("a", "b")))`
`5`	`3`	`expect_identical(div("a", "b", 5), htmlDiv(list("a", "b", 5)))`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("utils")`
`2`		`-`
`3`	`1`	`test_that("remove_empty", {`
`4`	`2`	`expect_error(remove_empty())`
`5`	`3`	`expect_null(remove_empty(NULL))`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("wildcards")`
`2`		`-`
`3`	`1`	test_that("HTML `data-` & `aria- ` wildcards work", {
`4`	`2`	x <- htmlDiv(`data-foo` = 1)
`5`	`3`	expect_equal(x$props$`data-foo`, 1)