Skip to content

Add inherit.blank argument to element constructors #1754

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 10 commits into from
Sep 21, 2016
Merged

Add inherit.blank argument to element constructors #1754

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fcf9081
Add inherit.blank argument to element constructors
thomasp85 Sep 16, 2016
37deef5
Look for inherit.blank when combining
thomasp85 Sep 16, 2016
3b27d0f
Update default themes for the new setup
thomasp85 Sep 16, 2016
aaa64e5
News bullet
thomasp85 Sep 17, 2016
ace0dee
Better documentation
thomasp85 Sep 17, 2016
84fd9f5
Set inherit.blank = TRUE automatically when theme is complete
thomasp85 Sep 17, 2016
edb2436
Merge branch 'hadley/master' into inherit-blank
thomasp85 Sep 17, 2016
fdbe5d0
Set all replacements to complete so inherit.blank is true
thomasp85 Sep 20, 2016
30e5493
Check value of inherit.blank
thomasp85 Sep 20, 2016
ea9b57e
Test all exported themes have inherit.blank = TRUE elements
thomasp85 Sep 20, 2016
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
Prev Previous commit
Test all exported themes have inherit.blank = TRUE elements
  • Loading branch information
@thomasp85
thomasp85 committed Sep 20, 2016
commit ea9b57ecfbdec8893ebe0e3b156aa339c17829d5
20 changes: 20 additions & 0 deletions tests/testthat/test-theme.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,23 @@ test_that("theme(validate=FALSE) means do not validate_element", {
red.before <- p + red.text + theme(animint.width = 500, validate = FALSE)
expect_equal(red.before$theme$animint.width, 500)
})

test_that("All elements in complete themes have inherit.blank=TRUE", {
inherit_blanks <- function(theme) {
all(vapply(theme, function(el) {
if (inherits(el, "element") && !inherits(el, "element_blank")) {
el$inherit.blank
} else {
TRUE
}
}, logical(1)))
}
expect_true(inherit_blanks(theme_grey()))
expect_true(inherit_blanks(theme_bw()))
expect_true(inherit_blanks(theme_classic()))
expect_true(inherit_blanks(theme_dark()))
expect_true(inherit_blanks(theme_light()))
expect_true(inherit_blanks(theme_linedraw()))
expect_true(inherit_blanks(theme_minimal()))
expect_true(inherit_blanks(theme_void()))
})