Skip to content

Only use data_frame in tests #3003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Nov 19, 2018
Merged

Only use data_frame in tests #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c2b7e0c
Resolve data upon extraction within ggplot_build
thomasp85 Jan 24, 2016
3b5eed9
Merge remote-tracking branch 'hadley/master'
thomasp85 May 13, 2016
e789d26
# Conflicts:
thomasp85 Jul 4, 2016
5e7fe1e
Merge branch 'hadley-master'
thomasp85 Jul 4, 2016
eb24025
Merge remote-tracking branch 'origin/master'
thomasp85 Oct 17, 2016
6287025
Merge remote-tracking branch 'hadley/master'
thomasp85 Oct 17, 2016
90c5da0
Merge branch 'tidyverse/master'
thomasp85 Dec 6, 2016
39dfb1f
Merge remote-tracking branch 'tidyverse/master'
thomasp85 Oct 25, 2018
d10d2e8
Memoize calls to descentDetails()
thomasp85 Oct 25, 2018
0eff97a
Merge remote-tracking branch 'upstream/master'
thomasp85 Oct 26, 2018
7c7d492
Merge branch 'memoise-descent' into new_data_frame
thomasp85 Oct 26, 2018
1476c6f
sub data.frame with new_data_frame in backbone functions
thomasp85 Oct 28, 2018
44f2d9a
Merge branch 'master' of https://github.com/tidyverse/ggplot2 into ne…
thomasp85 Nov 7, 2018
4af7f83
Update constructor API
thomasp85 Nov 7, 2018
5a92b7a
Remove data.frame calls in favour of new_data_frame
thomasp85 Nov 8, 2018
05d0484
Last effort to squash data.frame()
thomasp85 Nov 9, 2018
47ef11d
memoise by the current device as well
thomasp85 Nov 9, 2018
72c351f
import dev.cur
thomasp85 Nov 9, 2018
e14055c
Merge branch 'memoise-descent' into new_data_frame
thomasp85 Nov 9, 2018
a3bee4d
Remove tibble() where relevant
thomasp85 Nov 9, 2018
a5a4bdd
Merge branch 'master' of https://github.com/tidyverse/ggplot2 into ne…
thomasp85 Nov 12, 2018
50d1a7d
Add description to vignette
thomasp85 Nov 12, 2018
8606fff
Change data.frame constructor to do automatic recycling. Add data_fra…
thomasp85 Nov 13, 2018
d3ccd4c
Update tests to use data_frame instead of data.frame
thomasp85 Nov 13, 2018
dae8d4c
More strict recycling. Check for named input
thomasp85 Nov 13, 2018
57ffd8e
cleaner mat_2_col implementation
thomasp85 Nov 15, 2018
eb82d19
Removed unnessecary rep()
thomasp85 Nov 15, 2018
9efcffb
Remove stray stringAsFactors
thomasp85 Nov 15, 2018
f8e2476
Merge branch 'master' of https://github.com/tidyverse/ggplot2 into ne…
thomasp85 Nov 15, 2018
de843e5
Fix new tests to use data_frame
thomasp85 Nov 15, 2018
cef4c08
Make group a factor so it will be converted to integer when passed to…
thomasp85 Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/stat-contour.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ contour_lines <- function(data, breaks, complete = FALSE) {
x = xs,
y = ys,
piece = pieces,
group = groups
group = factor(groups)
), n = length(xs))
}

Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-layer.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ test_that("missing aesthetics trigger informative error", {
})

test_that("if an aes is mapped to a function that returns NULL, it is removed", {
df <- data.frame(x = 1:10)
df <- data_frame(x = 1:10)
null <- function(...) NULL
p <- cdata(ggplot(df, aes(x, null())))
expect_identical(names(p[[1]]), c("x", "PANEL", "group"))
Expand Down