Skip to content

Commit 3268170

Browse files
committed
Merge remote-tracking branch 'origin/master' into v1.0.x
2 parents 8bf81c3 + 8767e4e commit 3268170

File tree

3 files changed

+31
-5
lines changed

3 files changed

+31
-5
lines changed

pkg/github/issues.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ func (c Issues) Frames() data.Frames {
4141
for _, v := range c {
4242
var closedAt *time.Time
4343
if !v.ClosedAt.Time.IsZero() {
44-
closedAt = &v.ClosedAt.Time
44+
t := v.ClosedAt.Time
45+
closedAt = &t
4546
}
4647

4748
frame.AppendRow(

pkg/github/issues_test.go

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ func TestIssuesDataframe(t *testing.T) {
4141

4242
issues := Issues{
4343
Issue{
44-
Title: "Issue #1",
45-
ClosedAt: githubv4.DateTime{},
44+
Title: "Issue #1",
45+
ClosedAt: githubv4.DateTime{
46+
Time: time.Time{},
47+
},
4648
CreatedAt: githubv4.DateTime{
4749
Time: createdAt,
4850
},
@@ -82,6 +84,28 @@ func TestIssuesDataframe(t *testing.T) {
8284
},
8385
},
8486
},
87+
Issue{
88+
Title: "Issue #3",
89+
ClosedAt: githubv4.DateTime{
90+
Time: time.Time{},
91+
},
92+
CreatedAt: githubv4.DateTime{
93+
Time: createdAt,
94+
},
95+
Closed: false,
96+
Author: struct {
97+
User "graphql:\"... on User\""
98+
}{
99+
User: User{
100+
ID: "3",
101+
Login: "firstUser",
102+
Name: "First User",
103+
Company: "ACME Corp",
104+
105+
URL: "",
106+
},
107+
},
108+
},
85109
}
86110

87111
if err := testutil.CheckGoldenFramer("issues", issues); err != nil {

pkg/github/testdata/issues.golden.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
Frame[0]
44
Name: issues
5-
Dimensions: 6 Fields by 2 Rows
5+
Dimensions: 6 Fields by 3 Rows
66
+----------------+----------------+----------------------+--------------+---------------------------------+---------------------------------+
77
| Name: title | Name: author | Name: author_company | Name: closed | Name: created_at | Name: closed_at |
88
| Labels: | Labels: | Labels: | Labels: | Labels: | Labels: |
99
| Type: []string | Type: []string | Type: []string | Type: []bool | Type: []time.Time | Type: []*time.Time |
1010
+----------------+----------------+----------------------+--------------+---------------------------------+---------------------------------+
1111
| Issue #1 | firstUser | ACME Corp | false | 2020-08-25 16:21:56 +0000 +0000 | null |
1212
| Issue #2 | secondUser | ACME Corp | true | 2020-08-25 16:21:56 +0000 +0000 | 2020-08-25 22:21:56 +0000 +0000 |
13+
| Issue #3 | firstUser | ACME Corp | false | 2020-08-25 16:21:56 +0000 +0000 | null |
1314
+----------------+----------------+----------------------+--------------+---------------------------------+---------------------------------+
1415

1516

1617
====== TEST DATA RESPONSE (arrow base64) ======
17-
FRAME=QVJST1cxAAD/////GAMAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAABw/f//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAJD9//8IAAAAEAAAAAYAAABpc3N1ZXMAAAQAAABuYW1lAAAAAAYAAAAoAgAAuAEAAEwBAADwAAAAgAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAQAAAAEAAAAAAAAoBQAAAAAEAAAAEAAAABP7//wgAAAAUAAAACQAAAGNsb3NlZF9hdAAAAAQAAABuYW1lAAAAAAAAAACa////AAADAAkAAABjbG9zZWRfYXQAAAB6/v//FAAAAEAAAABIAAAAAAAACkgAAAABAAAABAAAAGj+//8IAAAAFAAAAAoAAABjcmVhdGVkX2F0AAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAoAAABjcmVhdGVkX2F0AADm/v//FAAAADwAAAA8AAAAAAAABjgAAAABAAAABAAAANT+//8IAAAAEAAAAAYAAABjbG9zZWQAAAQAAABuYW1lAAAAAAAAAADM/v//BgAAAGNsb3NlZAAAPv///xQAAABEAAAARAAAAAAAAAVAAAAAAQAAAAQAAAAs////CAAAABgAAAAOAAAAYXV0aG9yX2NvbXBhbnkAAAQAAABuYW1lAAAAAAAAAAAs////DgAAAGF1dGhvcl9jb21wYW55AACm////FAAAADwAAAA8AAAAAAAABTgAAAABAAAABAAAAJT///8IAAAAEAAAAAYAAABhdXRob3IAAAQAAABuYW1lAAAAAAAAAACM////BgAAAGF1dGhvcgAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABIAAAAAAAABUQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAHRpdGxlAAAABAAAAG5hbWUAAAAAAAAAAAQABAAEAAAABQAAAHRpdGxlAAAAAAAAAP////+oAQAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAoAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAACAEAAAIAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAQAAAAAAAAADAAAAAAAAAAGAAAAAAAAABIAAAAAAAAAAAAAAAAAAAASAAAAAAAAAAQAAAAAAAAAFgAAAAAAAAAGAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAIAAAAAAAAAHgAAAAAAAAAAAAAAAAAAAB4AAAAAAAAABAAAAAAAAAAiAAAAAAAAAAIAAAAAAAAAJAAAAAAAAAAEAAAAAAAAAAAAAAABgAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAABAAAAAAAAAAAAAAAIAAAAEAAAAAAAAABJc3N1ZSAjMUlzc3VlICMyAAAAAAkAAAATAAAAAAAAAGZpcnN0VXNlcnNlY29uZFVzZXIAAAAAAAAAAAAJAAAAEgAAAAAAAABBQ01FIENvcnBBQ01FIENvcnAAAAAAAAACAAAAAAAAAABo7bJVjy4WAGjtslWPLhYCAAAAAAAAAAAAAAAAAAAAAChB1/qiLhYQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAOAAAAAAAAwABAAAAKAMAAAAAAACwAQAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAABw/f//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAJD9//8IAAAAEAAAAAYAAABpc3N1ZXMAAAQAAABuYW1lAAAAAAYAAAAoAgAAuAEAAEwBAADwAAAAgAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAQAAAAEAAAAAAAAoBQAAAAAEAAAAEAAAABP7//wgAAAAUAAAACQAAAGNsb3NlZF9hdAAAAAQAAABuYW1lAAAAAAAAAACa////AAADAAkAAABjbG9zZWRfYXQAAAB6/v//FAAAAEAAAABIAAAAAAAACkgAAAABAAAABAAAAGj+//8IAAAAFAAAAAoAAABjcmVhdGVkX2F0AAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAoAAABjcmVhdGVkX2F0AADm/v//FAAAADwAAAA8AAAAAAAABjgAAAABAAAABAAAANT+//8IAAAAEAAAAAYAAABjbG9zZWQAAAQAAABuYW1lAAAAAAAAAADM/v//BgAAAGNsb3NlZAAAPv///xQAAABEAAAARAAAAAAAAAVAAAAAAQAAAAQAAAAs////CAAAABgAAAAOAAAAYXV0aG9yX2NvbXBhbnkAAAQAAABuYW1lAAAAAAAAAAAs////DgAAAGF1dGhvcl9jb21wYW55AACm////FAAAADwAAAA8AAAAAAAABTgAAAABAAAABAAAAJT///8IAAAAEAAAAAYAAABhdXRob3IAAAQAAABuYW1lAAAAAAAAAACM////BgAAAGF1dGhvcgAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABIAAAAAAAABUQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAHRpdGxlAAAABAAAAG5hbWUAAAAAAAAAAAQABAAEAAAABQAAAHRpdGxlAAAAQAMAAEFSUk9XMQ==
18+
FRAME=QVJST1cxAAD/////GAMAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAABw/f//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAJD9//8IAAAAEAAAAAYAAABpc3N1ZXMAAAQAAABuYW1lAAAAAAYAAAAoAgAAuAEAAEwBAADwAAAAgAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAQAAAAEAAAAAAAAoBQAAAAAEAAAAEAAAABP7//wgAAAAUAAAACQAAAGNsb3NlZF9hdAAAAAQAAABuYW1lAAAAAAAAAACa////AAADAAkAAABjbG9zZWRfYXQAAAB6/v//FAAAAEAAAABIAAAAAAAACkgAAAABAAAABAAAAGj+//8IAAAAFAAAAAoAAABjcmVhdGVkX2F0AAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAoAAABjcmVhdGVkX2F0AADm/v//FAAAADwAAAA8AAAAAAAABjgAAAABAAAABAAAANT+//8IAAAAEAAAAAYAAABjbG9zZWQAAAQAAABuYW1lAAAAAAAAAADM/v//BgAAAGNsb3NlZAAAPv///xQAAABEAAAARAAAAAAAAAVAAAAAAQAAAAQAAAAs////CAAAABgAAAAOAAAAYXV0aG9yX2NvbXBhbnkAAAQAAABuYW1lAAAAAAAAAAAs////DgAAAGF1dGhvcl9jb21wYW55AACm////FAAAADwAAAA8AAAAAAAABTgAAAABAAAABAAAAJT///8IAAAAEAAAAAYAAABhdXRob3IAAAQAAABuYW1lAAAAAAAAAACM////BgAAAGF1dGhvcgAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABIAAAAAAAABUQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAHRpdGxlAAAABAAAAG5hbWUAAAAAAAAAAAQABAAEAAAABQAAAHRpdGxlAAAAAAAAAP////+oAQAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAyAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAACAEAAAMAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAGAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAQAAAAAAAAADgAAAAAAAAAIAAAAAAAAABYAAAAAAAAAAAAAAAAAAAAWAAAAAAAAAAQAAAAAAAAAGgAAAAAAAAAIAAAAAAAAACIAAAAAAAAAAAAAAAAAAAAiAAAAAAAAAAIAAAAAAAAAJAAAAAAAAAAAAAAAAAAAACQAAAAAAAAABgAAAAAAAAAqAAAAAAAAAAIAAAAAAAAALAAAAAAAAAAGAAAAAAAAAAAAAAABgAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAACAAAAAAAAAAAAAAAIAAAAEAAAABgAAABJc3N1ZSAjMUlzc3VlICMySXNzdWUgIzMAAAAACQAAABMAAAAcAAAAZmlyc3RVc2Vyc2Vjb25kVXNlcmZpcnN0VXNlcgAAAAAAAAAACQAAABIAAAAbAAAAQUNNRSBDb3JwQUNNRSBDb3JwQUNNRSBDb3JwAAAAAAACAAAAAAAAAABo7bJVjy4WAGjtslWPLhYAaO2yVY8uFgIAAAAAAAAAAAAAAAAAAAAAKEHX+qIuFgAAAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAACgDAAAAAAAAsAEAAAAAAADIAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAAcP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAACQ/f//CAAAABAAAAAGAAAAaXNzdWVzAAAEAAAAbmFtZQAAAAAGAAAAKAIAALgBAABMAQAA8AAAAIAAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAEAAAABAAAAAAAAKAUAAAAABAAAABAAAAAT+//8IAAAAFAAAAAkAAABjbG9zZWRfYXQAAAAEAAAAbmFtZQAAAAAAAAAAmv///wAAAwAJAAAAY2xvc2VkX2F0AAAAev7//xQAAABAAAAASAAAAAAAAApIAAAAAQAAAAQAAABo/v//CAAAABQAAAAKAAAAY3JlYXRlZF9hdAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAKAAAAY3JlYXRlZF9hdAAA5v7//xQAAAA8AAAAPAAAAAAAAAY4AAAAAQAAAAQAAADU/v//CAAAABAAAAAGAAAAY2xvc2VkAAAEAAAAbmFtZQAAAAAAAAAAzP7//wYAAABjbG9zZWQAAD7///8UAAAARAAAAEQAAAAAAAAFQAAAAAEAAAAEAAAALP///wgAAAAYAAAADgAAAGF1dGhvcl9jb21wYW55AAAEAAAAbmFtZQAAAAAAAAAALP///w4AAABhdXRob3JfY29tcGFueQAApv///xQAAAA8AAAAPAAAAAAAAAU4AAAAAQAAAAQAAACU////CAAAABAAAAAGAAAAYXV0aG9yAAAEAAAAbmFtZQAAAAAAAAAAjP///wYAAABhdXRob3IAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAASAAAAAAAAAVEAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAUAAAB0aXRsZQAAAAQAAABuYW1lAAAAAAAAAAAEAAQABAAAAAUAAAB0aXRsZQAAAEADAABBUlJPVzE=

0 commit comments

Comments
 (0)