rt_score: final + wait arguments removed

Author: brry

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: codeoceanR
 Title: Test R tasks with CodeOcean at HPI
-Version: 0.3.19
-Date: 2021-03-30
+Version: 0.3.20
+Date: 2021-08-08
 Authors@R: 
     person(given = "Berry",
            family = "Boessenkool",

R/rt_score.R

@@ -14,17 +14,13 @@
 #'            Must contain ".co" and all the "script_n.R" files
 #'            referenced there, with the changes by the student, saved.
 #'            DEFAULT: "."
-#' @param final,wait Deprecated argument.
 #' @param submit Submit grade to openHPI? To be called from [rt_submit()].
 #'
-rt_score <- function(dir=".", final, wait, submit=FALSE)
+rt_score <- function(dir=".", submit=FALSE)
 {
-# Avoid recursive posting in case students leave rt_score() in the exercise script:
+# Avoid recursive posting, so we can have rt_score() in the exercise script:
 if(!interactive()) return(NULL)
 
-if(!missing(final) || !missing(wait))
-	stop("rt_score(final=TRUE) has been deprecated. Use rt_submit() instead.")
-
 # Check directory and file
 dir <- berryFunctions::normalizePathCP(dir)
 berryFunctions::checkFile(dir)

inst/extdata/tests.R

@@ -1,6 +1,7 @@
 # CodeOcean R Quiz
 # Berry Boessenkool, berry-b@gmx.de, early 2020 + Oct 2020
 
+
 # This script is run by `rt_score()` (in Rstudio) or by clicking "Score" (in CodeOcean).
 # Running this script may never fail on CodeOcean, hence keep it wrapped in `try()`.
 # The object 'task_id' must be defined here for the error messages through `rt_warn`.
@@ -14,7 +15,6 @@ library(codeoceanR) # for all functions prefixed with rt_
 ntests <-  3 # number of tests
 npassed <- 0 # number of passed tests
 
-
 trytests <- try({
 
 task_id <- "_run"
@@ -77,12 +77,12 @@ rt_has_argument(sol, "row.names", FALSE)
 
 }, silent=TRUE)
 task_id <- "_post"
-if(inherits(trytests, "try-error")) {
+if(inherits(trytests, "try-error"))
   rt_warn("The test script failed. Sorry for the 0 points right now. ",
   				"You'll have to revert the last thing(s) you did. ",
-  				if(interactive())"Please click 'Request comments' and copypaste the logfile below.\n", trytests)
-}
+  				"Please send Berry the logfile below through email or 'Request comments'.\n", trytests)
+
 # Final output -----------------------------------------------------------------
 
-# Keep the following at the end of the script, for CodeOcean scoring:
+if(npassed>ntests) npassed <- ntests # for Bonus points
 cat(ntests, "examples,", npassed, "passed\n")