diff --git a/tests/figs/creating-aesthetic-mappings/alpha-set-in-alpha.svg b/tests/figs/creating-aesthetic-mappings/alpha-set-in-alpha.svg index f3dec53672..3ff1dea706 100644 --- a/tests/figs/creating-aesthetic-mappings/alpha-set-in-alpha.svg +++ b/tests/figs/creating-aesthetic-mappings/alpha-set-in-alpha.svg @@ -14,39 +14,39 @@ - - + + - - - + + + -0.50 -0.75 -1.00 -1.25 -1.50 - - - - - - - - - +0.950 +0.975 +1.000 +1.025 +1.050 + + + + + + + + + -0.50 -0.75 -1.00 -1.25 -1.50 -1 +0.950 +0.975 +1.000 +1.025 +1.050 +1 1 -Alpha set in alpha +Alpha set in alpha diff --git a/tests/figs/creating-aesthetic-mappings/alpha-set-in-colour.svg b/tests/figs/creating-aesthetic-mappings/alpha-set-in-colour.svg index a0a87162a9..04abbfe3c1 100644 --- a/tests/figs/creating-aesthetic-mappings/alpha-set-in-colour.svg +++ b/tests/figs/creating-aesthetic-mappings/alpha-set-in-colour.svg @@ -14,39 +14,39 @@ - - + + - - - + + + -0.50 -0.75 -1.00 -1.25 -1.50 - - - - - - - - - +0.950 +0.975 +1.000 +1.025 +1.050 + + + + + + + + + -0.50 -0.75 -1.00 -1.25 -1.50 -1 +0.950 +0.975 +1.000 +1.025 +1.050 +1 1 -Alpha set in colour +Alpha set in colour diff --git a/tests/figs/deps.txt b/tests/figs/deps.txt index 077e52df4e..bcd763e74f 100644 --- a/tests/figs/deps.txt +++ b/tests/figs/deps.txt @@ -1,2 +1,2 @@ -ggplot2: 3.0.0 +ggplot2: 3.0.0.9000 vdiffr-svg-engine: 0.9000 diff --git a/tests/figs/facet-labels/parsed-facet-labels.svg b/tests/figs/facet-labels/parsed-facet-labels.svg index b3e608efa3..aaf3b25098 100644 --- a/tests/figs/facet-labels/parsed-facet-labels.svg +++ b/tests/figs/facet-labels/parsed-facet-labels.svg @@ -14,49 +14,49 @@ - - + + - - + + - - + + - -α -β + +α +β - - - - + + + + -0.50 -0.75 -1.00 -1.25 -1.50 -0.50 -0.75 -1.00 -1.25 -1.50 - - - - - -parsed facet labels +0.950 +0.975 +1.000 +1.025 +1.050 +0.950 +0.975 +1.000 +1.025 +1.050 + + + + + +parsed facet labels diff --git a/tests/figs/geom-dotplot/bin-y-dodged-coord-flip.svg b/tests/figs/geom-dotplot/bin-y-dodged-coord-flip.svg index b9ab7265cc..c2436e86c3 100644 --- a/tests/figs/geom-dotplot/bin-y-dodged-coord-flip.svg +++ b/tests/figs/geom-dotplot/bin-y-dodged-coord-flip.svg @@ -19,36 +19,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,36 +79,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/figs/geom-dotplot/bin-y-dodged.svg b/tests/figs/geom-dotplot/bin-y-dodged.svg index 3eae6664be..839a10c735 100644 --- a/tests/figs/geom-dotplot/bin-y-dodged.svg +++ b/tests/figs/geom-dotplot/bin-y-dodged.svg @@ -19,36 +19,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,36 +79,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/figs/geom-violin/dodging-and-coord-flip.svg b/tests/figs/geom-violin/dodging-and-coord-flip.svg index c9214c79ed..8cfce44ade 100644 --- a/tests/figs/geom-violin/dodging-and-coord-flip.svg +++ b/tests/figs/geom-violin/dodging-and-coord-flip.svg @@ -19,9 +19,9 @@ - - - + + + diff --git a/tests/figs/geom-violin/dodging.svg b/tests/figs/geom-violin/dodging.svg index 3b88874994..d1e8722190 100644 --- a/tests/figs/geom-violin/dodging.svg +++ b/tests/figs/geom-violin/dodging.svg @@ -19,9 +19,9 @@ - - - + + + diff --git a/tests/figs/guides/align-facet-labels-facets-horizontal.svg b/tests/figs/guides/align-facet-labels-facets-horizontal.svg index 67fa8b581f..8fbb6566e8 100644 --- a/tests/figs/guides/align-facet-labels-facets-horizontal.svg +++ b/tests/figs/guides/align-facet-labels-facets-horizontal.svg @@ -14,594 +14,594 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - - - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - -audi + +audi - - + + - -chevrolet + +chevrolet - - + + - -dodge + +dodge - - + + - -ford + +ford - - + + - -honda + +honda - - + + - -hyundai + +hyundai - - + + - -jeep + +jeep - - + + - -land rover + +land rover - - + + - -lincoln + +lincoln - - + + - -mercury + +mercury - - + + - -nissan + +nissan - - + + - -pontiac + +pontiac - - + + - -subaru + +subaru - - + + - -toyota + +toyota - - + + - -volkswagen + +volkswagen @@ -613,82 +613,82 @@ 20 30 40 -a6 quattro -a4 quattro -a4 - - - -k1500 tahoe 4wd -c1500 suburban 2wd -corvette -malibu - - - - -ram 1500 pickup 4wd -durango 4wd -dakota pickup 4wd -caravan 2wd - - - - -f150 pickup 4wd -expedition 2wd -explorer 4wd -mustang - - - - -civic - -tiburon -sonata - - -grand cherokee 4wd - -range rover - -navigator 2wd - -mountaineer 4wd - -pathfinder 4wd -maxima -altima - - - -grand prix - -forester awd -impreza awd - - -land cruiser wagon 4wd -4runner 4wd -toyota tacoma 4wd -camry solara -camry -corolla - - - - - - -gti -passat -jetta -new beetle - - - - +a6 quattro +a4 quattro +a4 + + + +k1500 tahoe 4wd +c1500 suburban 2wd +corvette +malibu + + + + +ram 1500 pickup 4wd +durango 4wd +dakota pickup 4wd +caravan 2wd + + + + +f150 pickup 4wd +expedition 2wd +explorer 4wd +mustang + + + + +civic + +tiburon +sonata + + +grand cherokee 4wd + +range rover + +navigator 2wd + +mountaineer 4wd + +pathfinder 4wd +maxima +altima + + + +grand prix + +forester awd +impreza awd + + +land cruiser wagon 4wd +4runner 4wd +toyota tacoma 4wd +camry solara +camry +corolla + + + + + + +gti +passat +jetta +new beetle + + + + hwy reorder(model, hwy) align facet labels, facets horizontal diff --git a/tests/figs/guides/align-facet-labels-facets-vertical.svg b/tests/figs/guides/align-facet-labels-facets-vertical.svg index 5ee18f1776..34fb6678ef 100644 --- a/tests/figs/guides/align-facet-labels-facets-vertical.svg +++ b/tests/figs/guides/align-facet-labels-facets-vertical.svg @@ -14,675 +14,675 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - - - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - -audi + +audi - - + + - -chevrolet + +chevrolet - - + + - -dodge + +dodge - - + + - -ford + +ford - - + + - -honda + +honda - - + + - -hyundai + +hyundai - - + + - -jeep + +jeep - - + + - -land rover + +land rover - - + + - -lincoln + +lincoln - - + + - -mercury + +mercury - - + + - -nissan + +nissan - - + + - -pontiac + +pontiac - - + + - -subaru + +subaru - - + + - -toyota + +toyota - - + + - -volkswagen + +volkswagen - - - -a6 quattro -a4 quattro -a4 - - - - -k1500 tahoe 4wd -c1500 suburban 2wd -corvette -malibu - - - - -ram 1500 pickup 4wd -durango 4wd -dakota pickup 4wd -caravan 2wd - - - - -f150 pickup 4wd -expedition 2wd -explorer 4wd -mustang - -civic - - -tiburon -sonata - -grand cherokee 4wd - -range rover - -navigator 2wd - -mountaineer 4wd - - - -pathfinder 4wd -maxima -altima - -grand prix - - -forester awd -impreza awd - - - - - - -land cruiser wagon 4wd -4runner 4wd -toyota tacoma 4wd -camry solara -camry -corolla - - - - -gti -passat -jetta -new beetle + + + +a6 quattro +a4 quattro +a4 + + + + +k1500 tahoe 4wd +c1500 suburban 2wd +corvette +malibu + + + + +ram 1500 pickup 4wd +durango 4wd +dakota pickup 4wd +caravan 2wd + + + + +f150 pickup 4wd +expedition 2wd +explorer 4wd +mustang + +civic + + +tiburon +sonata + +grand cherokee 4wd + +range rover + +navigator 2wd + +mountaineer 4wd + + + +pathfinder 4wd +maxima +altima + +grand prix + + +forester awd +impreza awd + + + + + + +land cruiser wagon 4wd +4runner 4wd +toyota tacoma 4wd +camry solara +camry +corolla + + + + +gti +passat +jetta +new beetle 20 30 40 diff --git a/tests/figs/scales-breaks-and-labels/no-alpha-breaks-no-legend.svg b/tests/figs/scales-breaks-and-labels/no-alpha-breaks-no-legend.svg index 70fc46ce12..584ca1aa80 100644 --- a/tests/figs/scales-breaks-and-labels/no-alpha-breaks-no-legend.svg +++ b/tests/figs/scales-breaks-and-labels/no-alpha-breaks-no-legend.svg @@ -43,11 +43,11 @@ -0.50 -0.75 -1.00 -1.25 -1.50 +0.950 +0.975 +1.000 +1.025 +1.050 x y no alpha breaks (no legend) diff --git a/tests/figs/scales-breaks-and-labels/no-colour-breaks-no-legend.svg b/tests/figs/scales-breaks-and-labels/no-colour-breaks-no-legend.svg index 16cb2e9b3f..70a602f001 100644 --- a/tests/figs/scales-breaks-and-labels/no-colour-breaks-no-legend.svg +++ b/tests/figs/scales-breaks-and-labels/no-colour-breaks-no-legend.svg @@ -43,11 +43,11 @@ -0.50 -0.75 -1.00 -1.25 -1.50 +0.950 +0.975 +1.000 +1.025 +1.050 x y no colour breaks (no legend) diff --git a/tests/figs/scales-breaks-and-labels/no-fill-breaks-no-legend.svg b/tests/figs/scales-breaks-and-labels/no-fill-breaks-no-legend.svg index 7019243a48..744ad5b381 100644 --- a/tests/figs/scales-breaks-and-labels/no-fill-breaks-no-legend.svg +++ b/tests/figs/scales-breaks-and-labels/no-fill-breaks-no-legend.svg @@ -43,11 +43,11 @@ -0.50 -0.75 -1.00 -1.25 -1.50 +0.950 +0.975 +1.000 +1.025 +1.050 x y no fill breaks (no legend) diff --git a/tests/figs/scales-breaks-and-labels/no-size-breaks-no-legend.svg b/tests/figs/scales-breaks-and-labels/no-size-breaks-no-legend.svg index 5ea01c3a73..4fdd19bb5b 100644 --- a/tests/figs/scales-breaks-and-labels/no-size-breaks-no-legend.svg +++ b/tests/figs/scales-breaks-and-labels/no-size-breaks-no-legend.svg @@ -43,11 +43,11 @@ -0.50 -0.75 -1.00 -1.25 -1.50 +0.950 +0.975 +1.000 +1.025 +1.050 x y no size breaks (no legend) diff --git a/tests/figs/scales-breaks-and-labels/numeric-log.svg b/tests/figs/scales-breaks-and-labels/numeric-log.svg index d7b5271aac..3403c84db0 100644 --- a/tests/figs/scales-breaks-and-labels/numeric-log.svg +++ b/tests/figs/scales-breaks-and-labels/numeric-log.svg @@ -14,38 +14,48 @@ - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + -10 -1000 - - - - - -8 -128 -2048 -numeric-log +1 +10 +100 +1000 +10000 + + + + + + + + +8 +128 +2048 +numeric-log diff --git a/tests/figs/sec-axis/sec-axis-skewed-transform.svg b/tests/figs/sec-axis/sec-axis-skewed-transform.svg index d02c966b67..db5cc9bfde 100644 --- a/tests/figs/sec-axis/sec-axis-skewed-transform.svg +++ b/tests/figs/sec-axis/sec-axis-skewed-transform.svg @@ -125,16 +125,16 @@ -1e-01 -1e+00 -1e+01 -1e+02 -1e+03 - - - - - +1e-01 +1e+00 +1e+01 +1e+02 +1e+03 + + + + + 0.00 0.25 0.50 diff --git a/tests/figs/themes/axes-styling.svg b/tests/figs/themes/axes-styling.svg index 6a1ce9c8b2..20f4ee6c69 100644 --- a/tests/figs/themes/axes-styling.svg +++ b/tests/figs/themes/axes-styling.svg @@ -51,14 +51,14 @@ -2.5 -5.0 -7.5 -10.0 - - - - +2.5 +5.0 +7.5 +10.0 + + + + 2.5 5.0 @@ -69,14 +69,14 @@ - - - - -2.5 -5.0 -7.5 -10.0 + + + + +2.5 +5.0 +7.5 +10.0 diff --git a/tests/testthat/helper-vdiffr.R b/tests/testthat/helper-vdiffr.R index 9eb809fc40..e0bca59e85 100644 --- a/tests/testthat/helper-vdiffr.R +++ b/tests/testthat/helper-vdiffr.R @@ -2,15 +2,19 @@ enable_vdiffr <- TRUE if (!requireNamespace("vdiffr", quietly = TRUE) || - utils::packageVersion("vdiffr") < "0.2.3.9000") { + utils::packageVersion("vdiffr") < "0.2.3.9000") { + enable_vdiffr <- FALSE +} + +if (paste(R.Version()$major, R.Version()$minor, sep = ".") < "3.3.0") { enable_vdiffr <- FALSE } expect_doppelganger <- function(title, fig, - path = NULL, - ..., - user_fonts = NULL, - verbose = FALSE) { + path = NULL, + ..., + user_fonts = NULL, + verbose = FALSE) { if (!enable_vdiffr) { expect_error(regexp = NA, ggplot_build(fig)) return(invisible(NULL))