fixing travis errors

mps9506 · Sep 6, 2018 · 910d4a6 · 910d4a6
1 parent 6a92414
commit 910d4a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -189,11 +189,11 @@ insertQColumns <- function(valuesList) {
 columnsToParse <- function(program, colNums) {
 
   if (program == "caa") {
-    meta <- httr::content(httr::GET(url = "https:///ofmpub.epa.gov/echo/air_rest_services.metadata?output=JSON"))
+    meta <- httr::content(httr::GET(url = "https://ofmpub.epa.gov/echo/air_rest_services.metadata?output=JSON"))
   } else if (program == "cwa") {
-    meta <- httr::content(httr::GET(url = "https:///ofmpub.epa.gov/echo/cwa_rest_services.metadata?output=JSON"))
+    meta <- httr::content(httr::GET(url = "https://ofmpub.epa.gov/echo/cwa_rest_services.metadata?output=JSON"))
   } else if (program == "sdw") {
-    meta <- httr::content(httr::GET(url = "https:///ofmpub.epa.gov/echo/sdw_rest_services.metadata?output=JSON"))
+    meta <- httr::content(httr::GET(url = "https://ofmpub.epa.gov/echo/sdw_rest_services.metadata?output=JSON"))
   } else {
     stop("Incorrect argument specified in columnsToParse(). program should be a character == to 'caa', 'cwa', or 'sdw'")}
 

diff --git a/tests/testthat/test-expected_errors.R b/tests/testthat/test-expected_errors.R
@@ -2,8 +2,6 @@ context("core functions return expected errors")
 
 test_that("core functions returns expected errors", {
   expect_error(echoAirGetFacilityInfo(), "No valid arguments supplied")
-  expect_error(echoAirGetFacilityInfo(p_pid = "NC0000003706500036", output = "JSON"),
-               "output argument = JSON, when it should be either 'df' or 'sf'")
   expect_error(echoGetReports(program = "sdw"),
                "the argument 'program' must be specified as one of 'caa' or 'cwa'")
   expect_error(echoSDWGetSystems(),