Skip to content

Commit a78da8a

Browse files
authored
Parity between folders in R/ and in tests/testthat/ (#6738)
* remove vestigial `aaa-.R` * collect all `aes-X.R` docs in single file * divorce various `aes_*()` variants * for descriptiveness, rename `aes-evaluation.R` to `aes-delayed-eval.R` * align `grouping.R` and `test-grouping.R` * tweaks to `test-grouping.R` * align `aes-delayed-eval.R` and `test-aes-delayed-eval.R` * reorganise aes tests * redocument * accept snapshots moving around * rename `annotation.R` to `annotate.R` * reorganise annotation family of tests * align `test-axis-secondary` * isolate binning logic in separate test file * rename `test-build.R` to `test-plot-build.R` * accept snapshots moving around * fix typo in `test-coord_sf.R` name * move test in `test-coord-train.R` * kebab-case `docs-layer.R` * migrate layer tests for empty data * migrate `test-draw-key.R` * accept snapshots moving around * align `facet-labeller` * cannibalise `test-facet-layout.R` * cannibalise `test-facet-map.R` * cannibalise `test-facet-strips.R` * migrate wrap/grid specific tests out from `test-facet.R` * accept snapshots moving around * isolate spatial `fortify()` test * quick little documentation * merge hline/vline into abline geom file * merge `geom-bar.R` and `geom-col.R` * clarify that `geom-defaults.R` was just about updating defaults * move default update tests to own file * cannibalise `test-geom-rule.R` * align `test-save.R` * align `test-grid-utils.R` * accept snapshots moving around * redistribute `test-guides.R` to separate files per guide * cannibalise `test-labellers.R` * align `test-munch.R` * align `test-patterns.R` * cannibalise `test-plot-summary-api.R` * clarify `performance.R` has performance utilities * underscore to kebab * align `test-qplot.R` * delete `test-range.R`: {scales} is responsible and tests this already * cannibalise `test-scale_date.R` * accept snapshots moving around * reorganise scale tests * repatriate `stat_count()` tests * align `test-stats.R` * reorganise theme tests * align `test-viridis.R` * move `allow_lambda` to general `utilities.R` * reorganise utilities tests * add snapshot tests for rd helper functions * add snapshot tests for `make_constructor()` * add tests for properties * add test for `print(<ggproto)` * extra utilities tests * add test for `deprecated_guide_args()` * fix a few loose ends * redocument `AxisSecondary` * separate `guide_bins()` and `guide_coloursteps()` snapshots * attempt to adhere to file name limits * remove fickle snapshot test * turn off aesthetics section check on older R * lol at my incompetence * update snapshots * redocument * get rid of variant snapshots * separate old guide expectations * is this the only failing test? * another attempt at placating the CI gods * is it some weird filename thingy? * try without messing with environment * avoid recalcitrant visual test
1 parent 8d9f428 commit a78da8a

File tree

279 files changed

+5819
-5372
lines changed

Some content is hidden

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

279 files changed

+5819
-5372
lines changed

DESCRIPTION

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,15 @@ LazyData: true
8686
Roxygen: list(markdown = TRUE)
8787
RoxygenNote: 7.3.3
8888
Collate:
89-
'ggproto.R'
89+
'aes-delayed-eval.R'
90+
'aes-variants.R'
9091
'ggplot-global.R'
91-
'aaa-.R'
92-
'aes-colour-fill-alpha.R'
93-
'aes-evaluation.R'
94-
'aes-group-order.R'
95-
'aes-linetype-size-shape.R'
96-
'aes-position.R'
92+
'ggproto.R'
9793
'all-classes.R'
9894
'compat-plyr.R'
9995
'utilities.R'
10096
'aes.R'
97+
'annotate.R'
10198
'annotation-borders.R'
10299
'utilities-checks.R'
103100
'legend-draw.R'
@@ -112,7 +109,6 @@ Collate:
112109
'annotation-map.R'
113110
'geom-raster.R'
114111
'annotation-raster.R'
115-
'annotation.R'
116112
'autolayer.R'
117113
'autoplot.R'
118114
'axis-secondary.R'
@@ -131,32 +127,32 @@ Collate:
131127
'coord-sf.R'
132128
'coord-transform.R'
133129
'data.R'
134-
'docs_layer.R'
130+
'docs-aes.R'
131+
'docs-layer.R'
135132
'facet-.R'
136133
'facet-grid-.R'
134+
'facet-labeller.R'
137135
'facet-null.R'
138136
'facet-wrap.R'
139137
'fortify-map.R'
140138
'fortify-models.R'
141139
'fortify-spatial.R'
142140
'fortify.R'
143141
'stat-.R'
144-
'geom-abline.R'
142+
'geom-abline-hline-vline.R'
145143
'geom-rect.R'
146144
'geom-bar.R'
147145
'geom-tile.R'
148146
'geom-bin2d.R'
149147
'geom-blank.R'
150148
'geom-boxplot.R'
151-
'geom-col.R'
152149
'geom-path.R'
153150
'geom-contour.R'
154151
'geom-point.R'
155152
'geom-count.R'
156153
'geom-crossbar.R'
157154
'geom-segment.R'
158155
'geom-curve.R'
159-
'geom-defaults.R'
160156
'geom-ribbon.R'
161157
'geom-density.R'
162158
'geom-density2d.R'
@@ -166,7 +162,6 @@ Collate:
166162
'geom-function.R'
167163
'geom-hex.R'
168164
'geom-histogram.R'
169-
'geom-hline.R'
170165
'geom-jitter.R'
171166
'geom-label.R'
172167
'geom-linerange.R'
@@ -177,8 +172,8 @@ Collate:
177172
'geom-smooth.R'
178173
'geom-spoke.R'
179174
'geom-text.R'
175+
'geom-update-defaults.R'
180176
'geom-violin.R'
181-
'geom-vline.R'
182177
'ggplot2-package.R'
183178
'grob-absolute.R'
184179
'grob-dotstack.R'
@@ -204,12 +199,10 @@ Collate:
204199
'hexbin.R'
205200
'import-standalone-obj-type.R'
206201
'import-standalone-types-check.R'
207-
'labeller.R'
208202
'labels.R'
209203
'layer-sf.R'
210204
'layout.R'
211205
'limits.R'
212-
'performance.R'
213206
'plot-build.R'
214207
'plot-construction.R'
215208
'plot-last.R'
@@ -289,6 +282,7 @@ Collate:
289282
'utilities-grid.R'
290283
'utilities-help.R'
291284
'utilities-patterns.R'
285+
'utilities-performance.R'
292286
'utilities-resolution.R'
293287
'utilities-tidy-eval.R'
294288
'zxx.R'

R/aaa-.R

Lines changed: 0 additions & 14 deletions
This file was deleted.

R/aes-colour-fill-alpha.R

Lines changed: 0 additions & 112 deletions
This file was deleted.
File renamed without changes.

R/aes-group-order.R

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)