Skip to content

Commit f29abc4

Browse files
jorwoodsjacalata
authored andcommitted
chore: pytestify request_option (#1695)
* fix: black ci errors * chore: pytestify request_option * fix: encoding error --------- Co-authored-by: Jordan Woods <13803242+jorwoods@users.noreply.github.com>
1 parent b1dd68a commit f29abc4

File tree

1 file changed

+12
-44
lines changed

1 file changed

+12
-44
lines changed

test/test_request_option.py

Lines changed: 12 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -339,25 +339,14 @@ def test_filtering_parameters(server: TSC.Server) -> None:
339339
opts = TSC.PDFRequestOptions()
340340
opts.parameter("name1@", "value1")
341341
opts.parameter("name2$", "value2")
342-
opts.parameter("Parameters.name3", "value3")
343-
opts.parameter("vf_Parameters.name4", "value4")
344342
opts.page_type = TSC.PDFRequestOptions.PageType.Tabloid
345343

346-
# While Tableau Server side IS case sensitive with the query string,
347-
# requiring the prefix to be "vf_Parameters", requests does not end
348-
# up preserving the case sensitivity with the Response.Request
349-
# object. It also shows up lowercased in the requests_mock request
350-
# history.
351344
resp = server.workbooks.get_request(url, request_object=opts)
352345
query_params = parse_qs(resp.request.query)
353-
assert "vf_parameters.name1@" in query_params
354-
assert "value1" in query_params["vf_parameters.name1@"]
355-
assert "vf_parameters.name2$" in query_params
356-
assert "value2" in query_params["vf_parameters.name2$"]
357-
assert "vf_parameters.name3" in query_params
358-
assert "value3" in query_params["vf_parameters.name3"]
359-
assert "vf_parameters.name4" in query_params
360-
assert "value4" in query_params["vf_parameters.name4"]
346+
assert "name1@" in query_params
347+
assert "value1" in query_params["name1@"]
348+
assert "name2$" in query_params
349+
assert "value2" in query_params["name2$"]
361350
assert "type" in query_params
362351
assert "tabloid" in query_params["type"]
363352

@@ -380,9 +369,6 @@ def test_queryset_endpoint_pagesize_filter(server: TSC.Server, page_size: int) -
380369
_ = list(queryset)
381370

382371

383-
44
384-
385-
386372
@pytest.mark.parametrize("page_size", [1, 10, 100, 1_000])
387373
def test_queryset_pagesize_filter(server: TSC.Server, page_size: int) -> None:
388374
with requests_mock.mock() as m:
@@ -431,31 +417,13 @@ def test_queryset_field_order(server: TSC.Server) -> None:
431417
assert "name" in fields
432418

433419

434-
def test_queryset_only_fields(self) -> None:
435-
loop = self.server.users.only_fields("id")
436-
assert "id" in loop.request_options.fields
437-
assert "_default_" not in loop.request_options.fields
438-
439-
def test_queryset_field_order(self) -> None:
440-
with requests_mock.mock() as m:
441-
m.get(self.server.views.baseurl, text=SLICING_QUERYSET_PAGE_1.read_text())
442-
loop = self.server.views.fields("id", "name")
443-
list(loop)
444-
history = m.request_history[0]
445-
446-
fields = history.qs.get("fields", [""])[0].split(",")
447-
448-
assert fields[0] == "_default_"
449-
assert "id" in fields
450-
assert "name" in fields
451-
452-
def test_queryset_field_all(self) -> None:
453-
with requests_mock.mock() as m:
454-
m.get(self.server.views.baseurl, text=SLICING_QUERYSET_PAGE_1.read_text())
455-
loop = self.server.views.fields("id", "name", "_all_")
456-
list(loop)
457-
history = m.request_history[0]
420+
def test_queryset_field_all(server: TSC.Server) -> None:
421+
with requests_mock.mock() as m:
422+
m.get(server.views.baseurl, text=SLICING_QUERYSET_PAGE_1.read_text())
423+
loop = server.views.fields("id", "name", "_all_")
424+
list(loop)
425+
history = m.request_history[0]
458426

459-
fields = history.qs.get("fields", [""])[0]
427+
fields = history.qs.get("fields", [""])[0]
460428

461-
assert fields == "_all_"
429+
assert fields == "_all_"

0 commit comments

Comments
 (0)