Skip to content

Commit

Permalink
Merge pull request #504 from Appsilon/upgrade-cypress
Browse files Browse the repository at this point in the history
chore: Upgrade Cypress to 13.0.0.
  • Loading branch information
jakubnowicki committed Oct 25, 2023
2 parents 7c7793a + 6f23a66 commit b032a3c
Show file tree
Hide file tree
Showing 15 changed files with 481 additions and 275 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yml
Expand Up @@ -131,7 +131,7 @@ jobs:
file.copy("app-files/Box.jsx", "RhinoApp/app/js/Box.jsx", overwrite = TRUE)
file.copy("app-files/test-hello.R", "RhinoApp/tests/testthat/test-hello.R", overwrite = TRUE)
file.copy("app-files/test-say_hello.R", "RhinoApp/tests/testthat/test-say_hello.R", overwrite = TRUE)
file.copy("app-files/hello.spec.js", "RhinoApp/tests/cypress/integration/hello.spec.js", overwrite = TRUE)
file.copy("app-files/hello.cy.js", "RhinoApp/tests/cypress/e2e/hello.cy.js", overwrite = TRUE)
file.remove("RhinoApp/tests/testthat/test-main.R")
- name: Cypress tests should confirm RhinoApp works
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
@@ -1,6 +1,6 @@
Package: rhino
Title: A Framework for Enterprise Shiny Applications
Version: 1.5.0
Version: 1.5.0.9000
Authors@R:
c(
person("Kamil", "Żyła", role = c("aut", "cre"), email = "opensource+kamil@appsilon.com"),
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
@@ -1,4 +1,8 @@
# rhino 1.5.0
# rhino (development)

1. Cypress updated to version 13.

# [rhino 1.5.0](https://github.com/Appsilon/rhino/releases/tag/v1.5.0)

1. Add Rstudio Addins for lint, build and test Sass, R and JavaScript. Updated new module Addin.
2. Fixes timeout during Cypress E2E tests with GitHub Actions.
Expand Down
6 changes: 6 additions & 0 deletions R/tools.R
Expand Up @@ -322,6 +322,12 @@ lint_sass <- function(fix = FALSE) {
#' defined in the `tests/cypress` directory.
#' Requires Node.js to be available on the system.
#'
#' Check out:
# nolint start: line_length_linter
#' [Tutorial: Write end-to-end tests with Cypress](https://appsilon.github.io/rhino/articles/tutorial/write-end-to-end-tests-with-cypress.html)
# nolint end
#' to learn how to write end-to-end tests for your Rhino app.
#'
#' If you want to write end-to-end tests with `{shinytest2}`, see our
#' [How-to: Use shinytest2](https://appsilon.github.io/rhino/articles/how-to/use-shinytest2.html)
#' guide.
Expand Down
7 changes: 7 additions & 0 deletions inst/templates/e2e_tests/tests/cypress.config.js
@@ -0,0 +1,7 @@
module.exports = {
e2e: {
setupNodeEvents(on, config) {},
baseUrl: 'http://localhost:3333',
supportFile: false,
},
}
5 changes: 0 additions & 5 deletions inst/templates/e2e_tests/tests/cypress.json

This file was deleted.

0 comments on commit b032a3c

Please sign in to comment.