Skip to content

Commit 7031a25

Browse files
authored
Merge pull request #1369 from ropensci/vdiffr-writer
leverage custom writer in vdiffr
2 parents a09ccb6 + bb82fdd commit 7031a25

File tree

244 files changed

+251
-2744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+251
-2744
lines changed

.travis.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,10 @@ cache: packages
33
sudo: true
44
dist: trusty
55
warnings_are_errors: false
6-
7-
matrix:
8-
include:
9-
- r:
10-
- devel
11-
- oldrel
12-
- release
13-
# run visual tests
14-
# TODO: push the svg files somewhere on after_failure?
15-
before_script: docker run -e MAPBOX_TOKEN=$MAPBOX_TOKEN -v $(pwd):/home/plotly --privileged cpsievert/plotly-orca R -e "devtools::install_deps('/home/plotly', dep = T); res <- devtools::test('/home/plotly', reporter='summary'); df <- as.data.frame(res); if (sum(df\$failed) > 0 || any(df\$error)) q(status=1)"
16-
6+
r:
7+
- devel
8+
- oldrel
9+
- release
1710

1811
env:
1912
global:
@@ -33,5 +26,8 @@ before_install:
3326
# make sure R pkgs are upt-to-date
3427
- Rscript -e 'update.packages(ask = FALSE)'
3528

29+
before_script:
30+
- if [[ "$TRAVIS_R_VERSION_STRING" == "release" ]]; then docker run -e MAPBOX_TOKEN=$MAPBOX_TOKEN -e VMODE="ci" -v $(pwd):/home/plotly --privileged cpsievert/plotly-orca; fi
31+
3632
# work around temporary travis + R 3.5 bug
3733
r_packages: devtools

inst/docker/Dockerfile.vtest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ RUN printf '#!/bin/bash \nxvfb-run --auto-servernum --server-args "-screen 0 640
8686
RUN chmod 777 /usr/bin/orca
8787

8888
# install visual testing packages
89-
RUN R -e "devtools::install_github('cpsievert/vdiffr@diffObj')"
89+
RUN R -e "devtools::install_github('lionel-/vdiffr')"
9090
RUN R -e "devtools::install_github('brodieG/diffobj@development')"
9191

9292
# switch on visual testing

tests/figs/abline/cookbook-axes-multiple-abline.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/abline/cookbook-axes-single-abline.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/area/area-area-fillcolor.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/area/area-simple.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/area/area-traces-order.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/bar/bar-aes-colour-guides-fill-false.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/bar/bar-aes-fill-guides-color-none.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/bar/bar-black-outline.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/bar/bar-category-names.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/bar/bar-color.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/figs/bar/bar-coord-flip.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)