Skip to content

Commit

Permalink
Update tests and bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
hafen committed Jun 21, 2018
1 parent c9f5e1a commit 4be901e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 22 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Package: trelliscopejs
Title: Create Interactive Trelliscope Displays
Version: 0.1.12
Version: 0.1.13
Authors@R: c(
person("Ryan", "Hafen", email = "rhafen@gmail.com", role = c("aut", "cre")),
person("Barret", "Schloerke", email = "schloerke@gmail.com", role = "aut")
)
Description: Trelliscope is a scalable, flexible, interactive approach to visualizing data. This package provides methods that make it easy to create a Trelliscope display specification for TrelliscopeJS. High-level functions are provided for creating displays from within dplyr or ggplot2 workflows. Low-level functions are also provided for creating new interfaces.
Depends:
R (>= 3.2.3)
R (>= 3.4.0)
License: BSD_3_clause + file LICENSE
Encoding: UTF-8
LazyData: true
Expand Down Expand Up @@ -41,7 +41,7 @@ Suggests:
housingData,
packagedocs
Remotes:
schloerke/autocogs
hafen/autocogs
RoxygenNote: 6.0.1
URL: https://github.com/hafen/trelliscopejs
BugReports: https://github.com/hafen/trelliscopejs/issues
Expand Down
24 changes: 5 additions & 19 deletions tests/testthat/test-trelliscope.R
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ test_that("examples run without barfing", {
facet_trelliscope(~ class + manufacturer, nrow = 2, ncol = 4)
print(p)

p <- qplot(cty, hwy, data = mpg) +
theme_bw() +
facet_trelliscope(vars(class), nrow = 2, ncol = 4)
print(p)

if (utils::packageVersion("ggplot2") > "2.2.1") {
p <- qplot(cty, hwy, data = mpg) +
theme_bw() +
facet_trelliscope(vars(class), nrow = 2, ncol = 4)
print(p)

p <- qplot(cty, hwy, data = mpg) +
theme_bw() +
facet_trelliscope(vars(class, manufacturer), nrow = 2, ncol = 4)
Expand Down Expand Up @@ -183,17 +183,6 @@ test_that("examples run without barfing", {

## other tidyverse functions

p <- iris %>%
nest(-Species) %>%
mutate(mod = map(data, ~ lm(Sepal.Length ~ Sepal.Width, data = .x))) %>%
by_row_plot(function(x) {
figure(xlab = "Sepal.Width", ylab = "Sepal.Length") %>%
ly_points(x$data[[1]]$Sepal.Width, x$data[[1]]$Sepal.Length) %>%
ly_abline(x$mod[[1]])
}) %>%
trelliscope(name = "iris", thumb = FALSE)
print(p)

p <- iris %>%
nest(-Species) %>%
mutate(
Expand Down Expand Up @@ -255,7 +244,4 @@ test_that("examples run without barfing", {
facet_trelliscope(~ Species, name = "iris_sample", auto_cog = TRUE)
print(p)




})

0 comments on commit 4be901e

Please sign in to comment.