rewrite some unit tests

RinteRface · Jun 17, 2020 · 9daeedd · 9daeedd
1 parent 92a9f4b
commit 9daeedd
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 37 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -17,7 +17,7 @@ Description: Develop outstanding 'shiny' apps for 'iOS', 'Android', desktop as w
     12 new widgets (expandable cards, badges, chips, timelines, gauges, progress bars, ...) 
     combined with the power of server-side notifications such as alerts, modals, toasts,
     action sheets, sheets (and more) as well as 3 layouts (single, tabs and split).
-Imports: shiny, htmltools, jsonlite, magrittr, golem
+Imports: shiny, htmltools, jsonlite, magrittr
 License: GPL-2
 Encoding: UTF-8
 URL: https://github.com/RinteRface/shinyMobile, https://rinterface.github.io/shinyMobile/

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -8,5 +8,5 @@ articles:
   Tabs-Layout: Tabs-Layout.html
   shinyMobile: shinyMobile.html
   shinyMobile_tools: shinyMobile_tools.html
-last_built: 2020-06-17T08:03Z
+last_built: 2020-06-17T10:15Z
 
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,5 +1,4 @@
 library(testthat)
-library(golem)
 library(shinyMobile)
 
 test_check("shinyMobile")
diff --git a/tests/testthat/test-check-input-bindings.R b/tests/testthat/test-check-input-bindings.R
diff --git a/tests/testthat/test-f7Accordion.R b/tests/testthat/test-f7Accordion.R
@@ -1,7 +1,7 @@
 context("f7Accordion")
 
 test_that("accordion", {
-  expect_shinytaglist(f7Accordion())
+  expect_true(inherits(f7Accordion(), "shiny.tag.list"))
   # [[1]] is the f7InputDeps() slot
   # [[2]] is the accordion wrapper slot
   expect_equal(
@@ -27,7 +27,7 @@ test_that("accordion", {
 
 
 test_that("accordion items", {
-  expect_shinytag(f7AccordionItem())
+  expect_true(inherits(f7AccordionItem(), "shiny.tag"))
   expect_equal(f7AccordionItem()$name, "li")
   expect_equal(f7AccordionItem()$attribs$class, "accordion-item")
   expect_equal(

diff --git a/tests/testthat/test-f7Appbar.R b/tests/testthat/test-f7Appbar.R
@@ -9,7 +9,7 @@ getInnerChildren <- function(tag) {
 }
 
 test_that("appbar", {
-  expect_shinytag(f7Appbar())
+  expect_true(inherits(f7Appbar(), "shiny.tag"))
   expect_equal(f7Appbar()$attribs$class, "appbar")
   expect_equal(f7Appbar()$children[[1]]$attribs$class, "appbar-inner")
 

diff --git a/tests/testthat/test-f7Badge.R b/tests/testthat/test-f7Badge.R
@@ -2,7 +2,7 @@ context("f7Badge")
 
 test_that("basic test", {
   badge <- f7Badge("mybadge")
-  expect_shinytag(badge)
+  expect_true(inherits(badge, "shiny.tag"))
   expect_equal(badge$name, "span")
   expect_equal(badge$attribs$class, "badge")
 

diff --git a/tests/testthat/test-f7Block.R b/tests/testthat/test-f7Block.R
@@ -1,7 +1,7 @@
 context("f7Block")
 
 test_that("block class", {
-  expect_shinytag(f7Block())
+  expect_true(inherits(f7Block(), "shiny.tag"))
   expect_equal(f7Block()$attribs$class, "block")
 
   # no hairlines, strong, inset, tablet
@@ -29,7 +29,7 @@ test_that("block class", {
 
 
 test_that("blocktitle", {
-  expect_shinytag(f7BlockTitle())
+  expect_true(inherits(f7BlockTitle(), "shiny.tag"))
   expect_equal(
     f7BlockTitle()$attribs$class,
     "block-title"

diff --git a/tests/testthat/test-f7Button.R b/tests/testthat/test-f7Button.R
@@ -1,7 +1,7 @@
 context("f7Button")
 
 test_that("button", {
-  expect_shinytaglist(f7Button())
+  expect_true(inherits(f7Button(), "shiny.tag.list"))
   # deps
   expect_is(f7Button()[[1]], "html_dependency")
 
@@ -31,7 +31,7 @@ test_that("button", {
 context("f7Segment")
 
 test_that("f7Segment", {
-  expect_shinytag(f7Segment(container = "segment"))
+  expect_true(inherits(f7Segment(container = "segment"), "shiny.tag"))
 
   # error
   expect_error(f7Segment(container = "row", rounded = TRUE))