Test fixes 12. Tests pass

Author: petteripiiroinen

tmcrstudioaddin/tests/testthat.R

@@ -10,49 +10,49 @@ library(tmcrstudioaddin)
 
 test_check("tmcrstudioaddin")
 
-    response <- login("a", "b", "c", "d", "tmc.mooc.fi")
+#    response <- login("a", "b", "c", "d", "tmc.mooc.fi")
 
-login <- function(clientID, secret, username, password, serverAddress) {
-  body <- list("grant_type" = "password",
-               "client_id" = clientID,
-               "client_secret" = secret,
-               "username" = username,
-               "password" = password)
-  # Authenticate
-  url <- paste(serverAddress, "/oauth/token", sep = "")
-  req <- httr::POST(url = url,
-                    body = body,
-                    config = httr::timeout(30),
-                    encode = "form")
-  # if http status is ok return token
-   .dcat("req", req)
-#   print(req)
-  if (status_code(req) == 200) {
-    token <- paste("Bearer", httr::content(req)$access_token)
-    credentials <- list(username      = username,
-                        token         = token,
-                        serverAddress = serverAddress,
-                        organization  = NULL)
-    # print("saveCredentials site A")
-    tmcrstudioaddin::saveCredentials(credentials)
-    response <- list(token             = token,
-                     error             = NULL,
-                     error_description = NULL)
-  } else if (status_code(req) == 400) {
-    response <- list(token             = NULL,
-                     error             = "Bad request",
-                     error_description = "Check your username and/or password")
-  } else if (status_code(req) == 401) {
-    response <- list(token             = NULL,
-                     error             = "Invalid credentials",
-                     error_description = "Check your username and/or password")
-  } else {
-    response <- list(token             = NULL,
-                     error             = "Error",
-                     error_description = "Something went wrong. Try again later")
-  }
-  return(response)
-}
+# login <- function(clientID, secret, username, password, serverAddress) {
+#   body <- list("grant_type" = "password",
+#                "client_id" = clientID,
+#                "client_secret" = secret,
+#                "username" = username,
+#                "password" = password)
+#   # Authenticate
+#   url <- paste(serverAddress, "/oauth/token", sep = "")
+#   req <- httr::POST(url = url,
+#                     body = body,
+#                     config = httr::timeout(30),
+#                     encode = "form")
+#   # if http status is ok return token
+#    .dcat("req", req)
+# #   print(req)
+#   if (status_code(req) == 200) {
+#     token <- paste("Bearer", httr::content(req)$access_token)
+#     credentials <- list(username      = username,
+#                         token         = token,
+#                         serverAddress = serverAddress,
+#                         organization  = NULL)
+#     # print("saveCredentials site A")
+#     tmcrstudioaddin::saveCredentials(credentials)
+#     response <- list(token             = token,
+#                      error             = NULL,
+#                      error_description = NULL)
+#   } else if (status_code(req) == 400) {
+#     response <- list(token             = NULL,
+#                      error             = "Bad request",
+#                      error_description = "Check your username and/or password")
+#   } else if (status_code(req) == 401) {
+#     response <- list(token             = NULL,
+#                      error             = "Invalid credentials",
+#                      error_description = "Check your username and/or password")
+#   } else {
+#     response <- list(token             = NULL,
+#                      error             = "Error",
+#                      error_description = "Something went wrong. Try again later")
+#   }
+#   return(response)
+# }
 
 .dcat <- function(name, x) {
   cat(paste0("<", name, ">\n"))

tmcrstudioaddin/tests/testthat/testSubmissions.R

@@ -27,9 +27,17 @@ mockProcessingSubmitJson <- function() {
 }
 
 test_that("If no metadata file, does not submit", {
-  credentials <- list()
+  credentials <- list(token = "token", serverAddress = "local.host.nowhere")
+#  stub(submit_current, "upload_current_exercise",
+#       list(error = list("Could not read json")))
+  print("AA")
+  print(noMetadata)
+  print(credentials)
   submitJson <- submit_current(path = noMetadata, credentials = credentials)
-  expect_equal(submitJson$error[[1]], "Could not read json")
+  print(submitJson)
+  print("BB")
+  expect_equal(submitJson$error[[1]], "Corrupted project: missing RTMC metadata")
+  print("CC")
 })
 
 test_that("submit_current works when no errors", {
@@ -190,3 +198,4 @@ test_that("Message function is called", {
            "<p>You can now view the model solution on the server.")
   expect_equal(args[[2]], expected_message)
 })
+