Skip to content

Commit

Permalink
Merge branch 'version-4.38' of https://github.com/bedatadriven/activi…
Browse files Browse the repository at this point in the history
…tyinfo-R into version-4.38
  • Loading branch information
nickdickinson committed Nov 21, 2024
2 parents 2b8e1cb + 2ed22a0 commit 4e951f7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
Binary file modified tests/testthat/_activityInfoSnaps/databases-databaseTree.RDS
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/testthat/_snaps/databases.md
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
# roleAssignment() works

Code
roleAssignment(roleId = "rp", roleParameter = list(partner = "test:test"),
roleAssignment(roleId = "rp", roleParameters = list(partner = "test:test"),
roleResources = list("resource1", "resource2", "resource3"))
Output
$id
Expand Down
3 changes: 1 addition & 2 deletions tests/testthat/test-databases.R
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ testthat::test_that("getDatabaseSchema() and getDatabaseTree() return same value
testthat::test_that("getDatabaseTree() works", {
tree <- getDatabaseTree(databaseId = database$databaseId)
testthat::expect_s3_class(tree, "databaseTree")
testthat::expect_named(tree, c("databaseId", "userId", "version", "label", "description", "ownerRef", "billingAccountId", "language", "originalLanguage", "continuousTranslation", "translationFromDbMemory", "thirdPartyTranslation", "languages", "role", "suspended", "storage", "publishedTemplate", "resources", "grants", "locks", "roles", "securityCategories"))
testthat::expect_identical(tree$databaseId, database$databaseId)
expectActivityInfoSnapshotCompare(tree, snapshotName = "databases-databaseTree", allowed_new_fields = TRUE)
})
Expand Down Expand Up @@ -575,7 +574,7 @@ testthat::test_that("Missing role resources and parameters are reported", {
testthat::test_that("roleAssignment() works", {
testthat::expect_snapshot(roleAssignment(
roleId = "rp",
roleParameter = list(partner = "test:test"),
roleParameters = list(partner = "test:test"),
roleResources = list("resource1", "resource2", "resource3")
))
})
Expand Down

0 comments on commit 4e951f7

Please sign in to comment.