Fixed bug from using new version of ggplot2.

R/graphing-functions.R

@@ -182,7 +182,7 @@ graph_SCD <- function(design, case, phase, session, outcome,
 
     dat$fitted <- if(design == "CMB") predict(model_fit, level = 1) else predict(model_fit)
 
-    p <- p + ggplot2::geom_line(data = dat, ggplot2::aes(y = fitted), size = 0.8)
+    p <- p + ggplot2::geom_line(data = dat, ggplot2::aes(y = fitted), linewidth = 0.8)
 
   }
 

tests/testthat/test_graphing_functions.R

@@ -3,7 +3,6 @@ context("Graphing functions")
 test_that("graph_SCD works for design = 'TR'", {
 
   skip_if_not_installed("ggplot2")
-  skip_on_cran()
 
   data("Anglesea")
 
@@ -50,8 +49,6 @@ test_that("graph_SCD works for design = 'MBP'", {
 
   skip_if_not_installed("ggplot2")
 
-  skip_on_cran()
-
   data("Laski")
 
   Laski_RML <- lme(fixed = outcome ~ 1 + treatment,
@@ -69,17 +66,15 @@ test_that("graph_SCD works for design = 'MBP'", {
   expect_s3_class(Laski_graph2, "ggplot")
   expect_invisible(print(Laski_graph2))
 
-  keys <- setdiff(names(Laski_graph1), c("plot_env", "labels","facet"))
+  keys <- setdiff(names(Laski_graph1), c("plot_env", "labels","layers"))
   expect_equal(Laski_graph1[keys], Laski_graph2[keys])
 
 })
 
 test_that("graph_SCD works for design = 'RMBB'", {
 
   skip_if_not_installed("ggplot2")
-
-  skip_on_cran()
-
+
   data("Thiemann2001")
   Thiemann2001_RML <- lme(outcome ~ 1 + time_c + treatment + trt_time,
                           random = ~ 1 | case / series,
@@ -113,7 +108,7 @@ test_that("graph_SCD works for design = 'RMBB'", {
   expect_s3_class(Thiemann_graph3, "ggplot")
   expect_invisible(print(Thiemann_graph3))
 
-  keys <- setdiff(names(Thiemann_graph1), c("plot_env", "labels", "facet"))
+  keys <- setdiff(names(Thiemann_graph1), c("plot_env", "labels", "layers"))
   expect_equal(Thiemann_graph1[keys], Thiemann_graph3[keys])
 
 })
@@ -122,8 +117,6 @@ test_that("graph_SCD works for design = 'CMB'", {
 
   skip_if_not_installed("ggplot2")
 
-  skip_on_cran()
-
   data("Bryant2018")
 
   Bryant2018_RML <-lme(fixed = outcome ~ treatment,
@@ -160,7 +153,7 @@ test_that("graph_SCD works for design = 'CMB'", {
   expect_s3_class(Bry_graph3, "ggplot")
   expect_invisible(print(Bry_graph3))
 
-  keys <- setdiff(names(Bry_graph1), c("plot_env", "labels", "facet"))
+  keys <- setdiff(names(Bry_graph1), c("plot_env", "labels", "layers"))
   expect_equal(Bry_graph1[keys], Bry_graph3[keys])
 
 })