Commit50fcd12

authored

Merge pull request#1058 from python-gitlab/fix/listattribute-get-api-splits-string

Fix: ListAttribute get_for_api() splits strings

2 parentsc5904c4 +a26e585 commit50fcd12Copy full SHA for 50fcd12

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,19 @@ def test_empty_input(self):`
`51`	`51`	`o.set_from_cli(" ")`
`52`	`52`	`self.assertEqual([],o.get())`
`53`	`53`
`54`		`-deftest_get_for_api(self):`
	`54`	`+deftest_get_for_api_from_cli(self):`
`55`	`55`	`o=types.ListAttribute()`
`56`	`56`	`o.set_from_cli("foo,bar,baz")`
`57`	`57`	`self.assertEqual("foo,bar,baz",o.get_for_api())`
`58`	`58`
	`59`	`+deftest_get_for_api_from_list(self):`
	`60`	`+o=types.ListAttribute(["foo","bar","baz"])`
	`61`	`+self.assertEqual("foo,bar,baz",o.get_for_api())`
	`62`	`+`
	`63`	`+deftest_get_for_api_does_not_split_string(self):`
	`64`	`+o=types.ListAttribute("foo")`
	`65`	`+self.assertEqual("foo",o.get_for_api())`
	`66`	`+`
`59`	`67`
`60`	`68`	`classTestLowercaseStringAttribute(unittest.TestCase):`
`61`	`69`	`deftest_get_for_api(self):`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ def set_from_cli(self, cli_value):`
`38`	`38`	`self._value= [item.strip()foritemincli_value.split(",")]`
`39`	`39`
`40`	`40`	`defget_for_api(self):`
	`41`	`+# Do not comma-split single value passed as string`
	`42`	`+ifisinstance(self._value,str):`
	`43`	`+returnself._value`
	`44`	`+`
`41`	`45`	`return",".join(self._value)`
`42`	`46`
`43`	`47`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -677,10 +677,17 @@`
`677`	`677`	`asserttype(issue1.closed_by())==list`
`678`	`678`	`asserttype(issue1.related_merge_requests())==list`
`679`	`679`
`680`		`-#issues labels and events`
	`680`	`+#issue labels`
`681`	`681`	`label2=admin_project.labels.create({"name":"label2","color":"#aabbcc"})`
`682`	`682`	`issue1.labels= ["label2"]`
`683`	`683`	`issue1.save()`
	`684`	`+`
	`685`	`+assertissue1inadmin_project.issues.list(labels=["label2"])`
	`686`	`+assertissue1inadmin_project.issues.list(labels="label2")`
	`687`	`+assertissue1inadmin_project.issues.list(labels="Any")`
	`688`	`+assertissue1notinadmin_project.issues.list(labels="None")`
	`689`	`+`
	`690`	`+# issue events`
`684`	`691`	`events=issue1.resourcelabelevents.list()`
`685`	`692`	`assertevents`
`686`	`693`	`event=issue1.resourcelabelevents.get(events[0].id)`

Comments

(0)