changed guide options test due to ggplot 2.2.0 changes to theme_bw

changed vignette to avoid layer-levle mappings which now produce warnings
wmurphyrd · Oct 23, 2016 · 2302bbe · 2302bbe
1 parent eb2323c
commit 2302bbe
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: colorplaner
 Type: Package
 Title: A ggplot2 Extension to Visualize Two Variables per Color Aesthetic
     Through Color Space Projections
-Version: 0.1.2
+Version: 0.1.2.9000
 Date: 2016-10-02
 Authors@R: c(person("William", "Murphy",
                   email = "william.murphy.rd@gmail.com",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# Version 0.1.2.9000 (devel)
+* Change tests to compensate for ggplot2 2.2.0 changes
+* Due to ggplot2 2.2.0 changes, mapping a colorplane at the level of an individual layer will now produce a false warning messsage, but full functionality remains intact
+
 # Version 0.1.2
 * Fixed an issue that was preventing updated vignettes from building
 * Complete versions of `colorplaner` and `other_projections` vignettes 

diff --git a/figure/colorplane-advanced-1.png b/figure/colorplane-advanced-1.png
diff --git a/figure/colorplane-basics-1.png b/figure/colorplane-basics-1.png
diff --git a/figure/colorplane-basics-2.png b/figure/colorplane-basics-2.png
diff --git a/figure/colorplane-concept-1.png b/figure/colorplane-concept-1.png
diff --git a/figure/colorplane-interpretation-1.png b/figure/colorplane-interpretation-1.png
diff --git a/figure/colorplane-interpretation-2.png b/figure/colorplane-interpretation-2.png
diff --git a/figure/intro-1.png b/figure/intro-1.png
diff --git a/readme.md b/readme.md
@@ -12,6 +12,11 @@
 The colorplaner R package is a ggplot2 extension to visualize two variables through one color aesthetic via mapping to a color space projection. With this technique for 2-D color mapping, one can create a dichotomous choropleth in R as
 well as other visualizations with bivariate color scales. The extension implements two new scales, `scale_color_colorplane` and `scale_fill_colorplane`, two new aesthetics, `color2` and `fill2`, and a new guide `guide_colorplane`. 
 
+
+```
+## Warning: Ignoring unknown aesthetics: color2
+```
+
 ![Example use of colorplane with the iris dataset.](figure/intro-1.png)
 
 
@@ -27,6 +32,10 @@ install.packages("colorplaner")
 devtools::install_github("wmurphyrd/colorplaner")
 ```
 
+#### Version 0.1.2.9000 (devel)
+* Change tests to compensate for ggplot2 2.2.0 changes
+* Due to ggplot2 2.2.0 changes, mapping a colorplane at the level of an individual layer will now produce a false warning messsage, but full functionality remains intact
+
 #### Version 0.1.2
 * Fixed an issue that was preventing updated vignettes from building
 * Complete versions of `colorplaner` and `other_projections` vignettes 

diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf
diff --git a/tests/testthat/test_guide_options.R b/tests/testthat/test_guide_options.R
@@ -13,8 +13,8 @@
 # along with colorplaner.  If not, see <http://www.gnu.org/licenses/>.
 
 text_theme <- theme_bw() %+%
-    theme(text =
-            element_text(color = "red", family = "mono"))
+  theme(text = element_text(color = "red", family = "mono"),
+        axis.text = element_text(color = "red", family = "mono"))
 
 test_that("Title options", {
   expect_silent(print(

diff --git a/tests/testthat/test_scale_training.R b/tests/testthat/test_scale_training.R
@@ -44,12 +44,12 @@ test_that("Plots with no valid mapping give informative message", {
 })
 
 test_that("Layer-level mappings produce guide axis titles without error", {
-  expect_silent(
+  expect_error(
     print(ggplot(aqd, aes(x = Temp, y = Ozone)) +
       geom_ribbon(aes(ymin = lwr, ymax = upr), alpha = .35) +
       geom_point(aes(color = Month, color2 = Day)) +
       geom_rug() +
       scale_color_colorplane() +
-      ggtitle("Points over grey ribbon"))
-  )
+      ggtitle("Points over grey ribbon")),
+    NA)
 })
diff --git a/vignettes/colorplaner.Rmd b/vignettes/colorplaner.Rmd
@@ -35,9 +35,9 @@ well as other visualizations with bivariate color scales. The extension implemen
 data(iris)
 
 iris_plot <- ggplot(iris, 
-                aes(x = Petal.Length, y = Petal.Width, shape = Species)) +
-  geom_point(aes(color = Sepal.Length, color2 = Sepal.Width),
-             position = "jitter") +
+                aes(x = Petal.Length, y = Petal.Width, shape = Species,
+                    color = Sepal.Length, color2 = Sepal.Width)) +
+  geom_point(position = "jitter") +
   scale_color_colorplane(limits = range(iris$Sepal.Length),
                          limits_y = range(iris$Sepal.Width),
                          breaks_y = function(x)seq.int(x[1], x[2]),