@@ -31,10 +31,11 @@ func TestRequestorImplRequestAll(t *testing.T) {
31
31
httphelpers .WithServer (handler , func (ts * httptest.Server ) {
32
32
r := NewPollingRequester (sharedtest .BasicClientContext (), nil , ts .URL , filter .key )
33
33
34
- data , cached , err := r .Request ()
34
+ data , cached , headers , err := r .Request ()
35
35
36
36
assert .NoError (t , err )
37
37
assert .False (t , cached )
38
+ assert .NotEmpty (t , headers )
38
39
39
40
assert .Equal (t , sharedtest .NormalizeDataSet (expectedData .Build ()), sharedtest .NormalizeDataSet (data ))
40
41
@@ -49,14 +50,15 @@ func TestRequestorImplRequestAll(t *testing.T) {
49
50
httphelpers .WithServer (handler , func (ts * httptest.Server ) {
50
51
r := NewPollingRequester (sharedtest .BasicClientContext (), nil , ts .URL , filter .key )
51
52
52
- data , cached , err := r .Request ()
53
+ data , cached , headers , err := r .Request ()
53
54
54
55
assert .Error (t , err )
55
56
if he , ok := err .(httpStatusError ); assert .True (t , ok ) {
56
57
assert .Equal (t , 500 , he .Code )
57
58
}
58
59
assert .False (t , cached )
59
60
assert .Nil (t , data )
61
+ assert .NotEmpty (t , headers )
60
62
})
61
63
})
62
64
@@ -68,37 +70,40 @@ func TestRequestorImplRequestAll(t *testing.T) {
68
70
})
69
71
r := NewPollingRequester (sharedtest .BasicClientContext (), nil , closedServerURL , filter .key )
70
72
71
- data , cached , err := r .Request ()
73
+ data , cached , headers , err := r .Request ()
72
74
73
75
assert .Error (t , err )
74
76
assert .False (t , cached )
75
77
assert .Nil (t , data )
78
+ assert .Nil (t , headers )
76
79
})
77
80
78
81
t .Run ("malformed data" , func (t * testing.T ) {
79
82
handler := httphelpers .HandlerWithResponse (200 , nil , []byte ("{" ))
80
83
httphelpers .WithServer (handler , func (ts * httptest.Server ) {
81
84
r := NewPollingRequester (sharedtest .BasicClientContext (), nil , ts .URL , filter .key )
82
85
83
- data , cached , err := r .Request ()
86
+ data , cached , headers , err := r .Request ()
84
87
85
88
require .Error (t , err )
86
89
_ , ok := err .(malformedJSONError )
87
90
assert .True (t , ok )
88
91
assert .False (t , cached )
89
92
assert .Nil (t , data )
93
+ assert .NotEmpty (t , headers )
90
94
})
91
95
})
92
96
93
97
t .Run ("malformed base URI" , func (t * testing.T ) {
94
98
r := NewPollingRequester (sharedtest .BasicClientContext (), nil , "::::" , filter .key )
95
99
96
- data , cached , err := r .Request ()
100
+ data , cached , headers , err := r .Request ()
97
101
98
102
require .Error (t , err )
99
103
assert .Contains (t , err .Error (), "missing protocol scheme" )
100
104
assert .False (t , cached )
101
105
assert .Nil (t , data )
106
+ assert .Nil (t , headers )
102
107
})
103
108
104
109
t .Run ("sends configured headers" , func (t * testing.T ) {
@@ -113,7 +118,7 @@ func TestRequestorImplRequestAll(t *testing.T) {
113
118
httphelpers .WithServer (handler , func (ts * httptest.Server ) {
114
119
r := NewPollingRequester (context , nil , ts .URL , filter .key )
115
120
116
- _ , _ , err := r .Request ()
121
+ _ , _ , _ , err := r .Request ()
117
122
assert .NoError (t , err )
118
123
119
124
req := <- requestsCh
@@ -130,7 +135,7 @@ func TestRequestorImplRequestAll(t *testing.T) {
130
135
httphelpers .WithServer (handler , func (ts * httptest.Server ) {
131
136
r := NewPollingRequester (context , nil , ts .URL , filter .key )
132
137
133
- _ , _ , err := r .Request ()
138
+ _ , _ , _ , err := r .Request ()
134
139
assert .NoError (t , err )
135
140
136
141
assert .Equal (t , []string {"Polling LaunchDarkly for feature flag updates" },
@@ -159,10 +164,11 @@ func TestRequestorImplCaching(t *testing.T) {
159
164
httphelpers .WithServer (handler , func (ts * httptest.Server ) {
160
165
r := NewPollingRequester (sharedtest .BasicClientContext (), nil , ts .URL , filter .key )
161
166
162
- data1 , cached1 , err1 := r .Request ()
167
+ data1 , cached1 , headers1 , err1 := r .Request ()
163
168
164
169
assert .NoError (t , err1 )
165
170
assert .False (t , cached1 )
171
+ assert .NotEmpty (t , headers1 )
166
172
assert .Equal (t , sharedtest .NormalizeDataSet (expectedData .Build ()), sharedtest .NormalizeDataSet (data1 ))
167
173
168
174
req1 := <- requestsCh
@@ -171,10 +177,11 @@ func TestRequestorImplCaching(t *testing.T) {
171
177
172
178
assert .Equal (t , "" , req1 .Request .Header .Get ("If-None-Match" ))
173
179
174
- data2 , cached2 , err2 := r .Request ()
180
+ data2 , cached2 , headers2 , err2 := r .Request ()
175
181
176
182
assert .NoError (t , err2 )
177
183
assert .True (t , cached2 )
184
+ assert .NotEmpty (t , headers2 )
178
185
assert .Nil (t , data2 ) // for cached data, requestAll doesn't bother parsing the body
179
186
180
187
req2 := <- requestsCh
@@ -196,7 +203,7 @@ func TestRequestorImplCanUseCustomHTTPClientFactory(t *testing.T) {
196
203
httphelpers .WithServer (pollHandler , func (ts * httptest.Server ) {
197
204
r := NewPollingRequester (context , nil , ts .URL , "" )
198
205
199
- _ , _ , _ = r .Request ()
206
+ _ , _ , _ , _ = r .Request ()
200
207
201
208
req := <- requestsCh
202
209
@@ -212,7 +219,7 @@ func TestRequestorImplCanAppendsFilterParameter(t *testing.T) {
212
219
httphelpers .WithServer (pollHandler , func (ts * httptest.Server ) {
213
220
r := NewPollingRequester (sharedtest .BasicClientContext (), nil , ts .URL , filter .key )
214
221
215
- _ , _ , _ = r .Request ()
222
+ _ , _ , _ , _ = r .Request ()
216
223
217
224
req := <- requestsCh
218
225
0 commit comments