Fix mock files and tests to avoid changing the calls at every version…

… bump
ropensci · Aug 18, 2023 · 4ea6346 · 4ea6346
1 parent 176a785
commit 4ea6346
Show file tree

Hide file tree

Showing 24 changed files with 16 additions and 12 deletions.
diff --git a/...g/api/0.6/changeset/266770-17e472-PUT.xml → ...g/api/0.6/changeset/268845-027b21-PUT.xml b/...g/api/0.6/changeset/266770-17e472-PUT.xml → ...g/api/0.6/changeset/268845-027b21-PUT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <osm version="0.6" generator="OpenStreetMap server" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
-<changeset id="266770" created_at="2023-08-04T15:07:55Z" open="true" comments_count="0" changes_count="0" uid="12141" user="jmaspons">
+<changeset id="268845" created_at="2023-08-18T16:28:07Z" open="true" comments_count="0" changes_count="0" uid="12141" user="jmaspons">
   <tag k="comment" v="Improved description of the changeset"/>
-  <tag k="created_by" v="osmapiR 0.0.0.10"/>
+  <tag k="created_by" v="osmapiR"/>
   <tag k="hashtags" v="#testing;#osmapiR"/>
 </changeset>
 </osm>
diff --git a/...eset/osm.org/api/0.6/changeset/266770.xml → ...eset/osm.org/api/0.6/changeset/268845.xml b/...eset/osm.org/api/0.6/changeset/266770.xml → ...eset/osm.org/api/0.6/changeset/268845.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <osm version="0.6" generator="CGImap 0.8.8 (012345 ******.openstreetmap.org)" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
- <changeset id="266770" created_at="2023-08-04T15:07:55Z" open="true" user="jmaspons" uid="12141" comments_count="0" changes_count="0">
+ <changeset id="268845" created_at="2023-08-18T16:28:07Z" open="true" user="jmaspons" uid="12141" comments_count="0" changes_count="0">
   <tag k="hashtags" v="#testing;#osmapiR"/>
   <tag k="source" v="GPS;survey"/>
-  <tag k="created_by" v="osmapiR 0.0.0.10"/>
+  <tag k="created_by" v="osmapiR"/>
   <tag k="comment" v="Describe the changeset"/>
  </changeset>
 </osm>
diff --git a/tests/testthat/mock_edit_changeset/osm.org/api/0.6/changeset/create-3af8d1-PUT.txt b/tests/testthat/mock_edit_changeset/osm.org/api/0.6/changeset/create-3af8d1-PUT.txt
@@ -0,0 +1 @@
+268845
diff --git a/tests/testthat/mock_edit_changeset/osm.org/api/0.6/changeset/create-afa5ef-PUT.txt b/tests/testthat/mock_edit_changeset/osm.org/api/0.6/changeset/create-afa5ef-PUT.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/changeset/create-887afa-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/changeset/create-887afa-PUT.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/changeset/create-dd36bf-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/changeset/create-dd36bf-PUT.txt
@@ -0,0 +1 @@
+268847
diff --git a/...api/0.6/node/4333009469-54670e-DELETE.txt → ...api/0.6/node/4333265939-2ee526-DELETE.txt b/...api/0.6/node/4333009469-54670e-DELETE.txt → ...api/0.6/node/4333265939-2ee526-DELETE.txt
diff --git a/...rg/api/0.6/node/4333009469-0193e8-PUT.txt → ...rg/api/0.6/node/4333265939-f21f48-PUT.txt b/...rg/api/0.6/node/4333009469-0193e8-PUT.txt → ...rg/api/0.6/node/4333265939-f21f48-PUT.txt
diff --git a/...api/0.6/node/4333009470-60462c-DELETE.txt → ...api/0.6/node/4333265940-08f959-DELETE.txt b/...api/0.6/node/4333009470-60462c-DELETE.txt → ...api/0.6/node/4333265940-08f959-DELETE.txt
diff --git a/...rg/api/0.6/node/4333009470-795653-PUT.txt → ...rg/api/0.6/node/4333265940-a269f6-PUT.txt b/...rg/api/0.6/node/4333009470-795653-PUT.txt → ...rg/api/0.6/node/4333265940-a269f6-PUT.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/node/create-069ac3-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/node/create-069ac3-PUT.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/node/create-08e709-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/node/create-08e709-PUT.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/node/create-acf05b-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/node/create-acf05b-PUT.txt
@@ -0,0 +1 @@
+4333265939
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/node/create-db0862-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/node/create-db0862-PUT.txt
@@ -0,0 +1 @@
+4333265940
diff --git a/...pi/0.6/relation/4304990553-d63e91-PUT.txt → ...pi/0.6/relation/4304991058-69bc51-PUT.txt b/...pi/0.6/relation/4304990553-d63e91-PUT.txt → ...pi/0.6/relation/4304991058-69bc51-PUT.txt
diff --git a/...0.6/relation/4304990553-9a5510-DELETE.txt → ...0.6/relation/4304991058-c0124d-DELETE.txt b/...0.6/relation/4304990553-9a5510-DELETE.txt → ...0.6/relation/4304991058-c0124d-DELETE.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/relation/create-661ac2-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/relation/create-661ac2-PUT.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/relation/create-ab3b56-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/relation/create-ab3b56-PUT.txt
@@ -0,0 +1 @@
+4304991058
diff --git a/...org/api/0.6/way/4306099607-c4779b-PUT.txt → ...org/api/0.6/way/4306137829-1650da-PUT.txt b/...org/api/0.6/way/4306099607-c4779b-PUT.txt → ...org/api/0.6/way/4306137829-1650da-PUT.txt
diff --git a/.../api/0.6/way/4306099607-552590-DELETE.txt → .../api/0.6/way/4306137829-d9e7f3-DELETE.txt b/.../api/0.6/way/4306099607-552590-DELETE.txt → .../api/0.6/way/4306137829-d9e7f3-DELETE.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/way/create-2df8ef-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/way/create-2df8ef-PUT.txt
diff --git a/tests/testthat/mock_edit_objects/osm.org/api/0.6/way/create-4efba0-PUT.txt b/tests/testthat/mock_edit_objects/osm.org/api/0.6/way/create-4efba0-PUT.txt
@@ -0,0 +1 @@
+4306137829
diff --git a/tests/testthat/test-changesets.R b/tests/testthat/test-changesets.R
@@ -32,6 +32,7 @@ test_that("edit changeset (create/update/diff upload) works", {
     expect_message(
       chset_id <- osm_create_changeset(
         comment = "Describe the changeset",
+        created_by = "osmapiR", # avoid changes in calls when updating version
         source = "GPS;survey",
         hashtags = "#testing;#osmapiR",
         verbose = TRUE
@@ -45,6 +46,7 @@ test_that("edit changeset (create/update/diff upload) works", {
     upd_chaset <- osm_update_changeset(
       changeset_id = chset_id,
       comment = "Improved description of the changeset",
+      created_by = "osmapiR", # avoid changes in calls when updating version
       hashtags = "#testing;#osmapiR"
     )
   })
@@ -71,6 +73,7 @@ test_that("edit changeset (create/update/diff upload) works", {
   osm_change_xml <- osmcha_DF2xml(osm_change)
 
   with_mock_dir("mock_diff_up_changeset", {
+    # TODO: better testing for osm_idff_upload_changeset
     # fetch <- list()
     # fetch$node <- osm_fetch_objects(osm_type = "nodes", osm_ids = c(35308286, 1935675367))
     # fetch$way <- osm_fetch_objects(osm_type = "ways", osm_ids = c(13073736L, 235744929L))

diff --git a/tests/testthat/test-elements.R b/tests/testthat/test-elements.R
@@ -60,6 +60,7 @@ test_that("edit OSM object works", {
   with_mock_dir("mock_edit_objects", {
     changeset_id <- osm_create_changeset(
       comment = "Test object creation",
+      created_by = "osmapiR", # avoid changes in calls when updating version
       source = "Imagination",
       hashtags = "#testing;#osmapiR",
       verbose = TRUE
@@ -105,8 +106,8 @@ test_that("edit OSM object works", {
     }
 
     # osm_close_changeset(changeset_id)
-    # TODO: Error in `resp_body_raw()`: ! Can not retrieve empty body
-    # error related with httptest2?
+    # TODO: Error in `resp_body_raw()`: ! Can not retrieve empty body. Fixed in httptest2 > 0.1.0
+    # https://github.com/nealrichardson/httptest2/pull/28
   })
 
   expect_match(create_id, "[0-9]+")