cleaning up

DESCRIPTION

@@ -22,42 +22,4 @@ License: MIT + file LICENSE
 LazyData: true
 Authors@R: c(person("Andreas", "Alfons", role = "aut"),
     person("Filip", "Schouwenaars", email = "[email protected]", role = c("aut", "cre")))
-Collate:
-    'expectations-like.R'
-    'message-builder.R'
-    'reporter-DataCamp.R'
-    'success-msg.R'
-    'test-an-object.R'
-    'test-chunk-options.R'
-    'test-correct.R'
-    'test-data-frame.R'
-    'test-error.R'
-    'test-exercise.R'
-    'test-expression-output.R'
-    'test-expression-result.R'
-    'test-file-exists.R'
-    'test-for-loop.R'
-    'test-function-definition.R'
-    'test-function-v2.R'
-    'test-function.R'
-    'test-ggplot.R'
-    'test-if-else.R'
-    'test-instruction.R'
-    'test-library-function.R'
-    'test-mc.R'
-    'test-object.R'
-    'test-or.R'
-    'test-output-contains.R'
-    'test-output-regex.R'
-    'test-rmd-file.R'
-    'test-rmd-group.R'
-    'test-student-typed.R'
-    'test-sufficient-length.R'
-    'test-text.R'
-    'test-that.R'
-    'test-what.R'
-    'test-while-loop.R'
-    'test-yaml-header.R'
-    'testwhat.R'
-    'utils.R'
 RoxygenNote: 5.0.1

NAMESPACE

@@ -30,7 +30,6 @@ export(test_rmd_file)
 export(test_rmd_group)
 export(test_student_typed)
 export(test_sufficient_length)
-export(test_summary)
 export(test_text)
 export(test_that)
 export(test_what)

R/reporter-DataCamp.R

@@ -120,7 +120,8 @@ DataCampReporter <- setRefClass(
                       message = to_html(results[[selector]]$failure_msg), 
                       tags = results[[selector]]$tags))
         } else {
-          return(list(correct = TRUE, message = to_html(success_msg)))
+          return(list(correct = TRUE, 
+                      message = to_html(success_msg)))
         }
       }
     }

R/test-an-object.R

@@ -35,7 +35,9 @@ test_an_object <- function(name,
   # Get needed elements from tw
   student_env <- tw$get("student_env")
   solution_env <- tw$get("solution_env")
-  init_tags()
+  init_tags(fun = "test_an_object", 
+            auto_feedback = is.null(undefined_msg), 
+            eq_condition = eq_condition)
 
   if (is.null(name)) {
     stop("argument \"name\" is missing, with no default")

R/test-object.R

@@ -59,7 +59,7 @@ test_object <- function(name, eq_condition = "equivalent",
   stopifnot(exists(name, envir =  solution_env, inherits = FALSE))
   solution <- get(name, envir = solution_env, inherits = FALSE)
 
-  set_tags(automated_message = is.null(undefined_msg))
+  set_tags(auto_feedback = is.null(undefined_msg))
   if (is.null(undefined_msg)) {
     undefined_msg <- build_undefined_object_msg(name)
   }
@@ -77,7 +77,7 @@ test_object <- function(name, eq_condition = "equivalent",
                                    like = expect_like,
                                    stop("invalid equality condition"))
 
-    set_tags(automated_message = is.null(incorrect_msg))
+    set_tags(auto_feedback = is.null(incorrect_msg))
     if (is.null(incorrect_msg)) {
       incorrect_msg <- build_incorrect_object_msg(name)
     }

testwhat.Rproj

@@ -15,4 +15,4 @@ LaTeX: pdfLaTeX
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
-PackageRoxygenize: rd,namespace,vignette
+PackageRoxygenize: rd,collate,namespace,vignette