Skip to content

Commit 1fbfbd5

Browse files
machinabotmachinabot
authored
Merge pull request #3 from machinebox/accepts-json
Added tests for Accept and set correct Content-Type
2 parents 13f6abc + 857193e commit 1fbfbd5

14 files changed

+36
-0
lines changed

‎facebox/facebox_check.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func (c *Client) CheckURL(imageURL *url.URL) ([]Face, error) {
6666
if err != nil {
6767
return nil, err
6868
}
69+
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
6970
req.Header.Set("Accept", "application/json; charset=utf-8")
7071
resp, err := c.HTTPClient.Do(req)
7172
if err != nil {

‎facebox/facebox_check_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ func TestCheckURL(t *testing.T) {
2121

2222
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2323
is.Equal(r.URL.Path, "/facebox/check")
24+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
2425
is.Equal(r.FormValue("url"), imageURL.String())
2526
io.WriteString(w, `{
2627
"success": true,
@@ -86,6 +87,7 @@ func TestCheckURLError(t *testing.T) {
8687

8788
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
8889
is.Equal(r.URL.Path, "/facebox/check")
90+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
8991
is.Equal(r.FormValue("url"), imageURL.String())
9092
io.WriteString(w, `{
9193
"success": false,
@@ -106,6 +108,7 @@ func TestCheckImage(t *testing.T) {
106108

107109
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
108110
is.Equal(r.URL.Path, "/facebox/check")
111+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
109112
f, _, err := r.FormFile("file")
110113
is.NoErr(err)
111114
defer f.Close()
@@ -173,6 +176,7 @@ func TestCheckImageError(t *testing.T) {
173176

174177
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
175178
is.Equal(r.URL.Path, "/facebox/check")
179+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
176180
f, _, err := r.FormFile("file")
177181
is.NoErr(err)
178182
defer f.Close()

‎facebox/facebox_similar.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func (c *Client) SimilarURL(imageURL *url.URL) ([]Similar, error) {
6666
if err != nil {
6767
return nil, err
6868
}
69+
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
6970
req.Header.Set("Accept", "application/json; charset=utf-8")
7071
resp, err := c.HTTPClient.Do(req)
7172
if err != nil {

‎facebox/facebox_similar_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ func TestSimilarURL(t *testing.T) {
2121

2222
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2323
is.Equal(r.URL.Path, "/facebox/similar")
24+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
2425
is.Equal(r.FormValue("url"), imageURL.String())
2526
io.WriteString(w, `{
2627
"success": true,
@@ -67,6 +68,7 @@ func TestSimilarURLError(t *testing.T) {
6768

6869
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
6970
is.Equal(r.URL.Path, "/facebox/similar")
71+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
7072
is.Equal(r.FormValue("url"), imageURL.String())
7173
io.WriteString(w, `{
7274
"success": false,
@@ -87,6 +89,7 @@ func TestSimilarImage(t *testing.T) {
8789

8890
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
8991
is.Equal(r.URL.Path, "/facebox/similar")
92+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
9093
f, _, err := r.FormFile("file")
9194
is.NoErr(err)
9295
defer f.Close()
@@ -135,6 +138,7 @@ func TestSimilarImageError(t *testing.T) {
135138

136139
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
137140
is.Equal(r.URL.Path, "/facebox/similar")
141+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
138142
f, _, err := r.FormFile("file")
139143
is.NoErr(err)
140144
defer f.Close()

‎facebox/facebox_state.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ func (c *Client) PostStateURL(stateURL *url.URL) error {
8787
if err != nil {
8888
return err
8989
}
90+
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
9091
req.Header.Set("Accept", "application/json; charset=utf-8")
9192
resp, err := c.HTTPClient.Do(req)
9293
if err != nil {

‎facebox/facebox_state_test.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ func TestOpenState(t *testing.T) {
1818
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
1919
is.Equal(r.Method, "GET")
2020
is.Equal(r.URL.Path, "/facebox/state")
21+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
2122
io.WriteString(w, `(pretend this is the state file)`)
2223
}))
2324
defer srv.Close()
@@ -35,6 +36,7 @@ func TestPostState(t *testing.T) {
3536
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
3637
is.Equal(r.Method, "POST")
3738
is.Equal(r.URL.Path, "/facebox/state")
39+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
3840
f, _, err := r.FormFile("file")
3941
is.NoErr(err)
4042
b, err := ioutil.ReadAll(f)
@@ -54,6 +56,7 @@ func TestPostStateError(t *testing.T) {
5456
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
5557
is.Equal(r.Method, "POST")
5658
is.Equal(r.URL.Path, "/facebox/state")
59+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
5760
f, _, err := r.FormFile("file")
5861
is.NoErr(err)
5962
b, err := ioutil.ReadAll(f)
@@ -74,6 +77,7 @@ func TestPostStateURL(t *testing.T) {
7477
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
7578
is.Equal(r.Method, "POST")
7679
is.Equal(r.URL.Path, "/facebox/state")
80+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
7781
is.Equal(r.FormValue("url"), "https://test.machinebox.io/test.facebox")
7882
io.WriteString(w, `{"success":true}`)
7983
}))
@@ -90,6 +94,7 @@ func TestPostStateURLError(t *testing.T) {
9094
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
9195
is.Equal(r.Method, "POST")
9296
is.Equal(r.URL.Path, "/facebox/state")
97+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
9398
is.Equal(r.FormValue("url"), "https://test.machinebox.io/test.facebox")
9499
io.WriteString(w, `{"success":false,"error":"something went wrong"}`)
95100
}))

‎facebox/facebox_teach.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ func (c *Client) TeachURL(imageURL *url.URL, id, name string) error {
8181
if err != nil {
8282
return err
8383
}
84+
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
8485
req.Header.Set("Accept", "application/json; charset=utf-8")
8586
resp, err := c.HTTPClient.Do(req)
8687
if err != nil {

‎facebox/facebox_teach_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ func TestTeachURL(t *testing.T) {
1919
is.NoErr(err)
2020
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2121
is.Equal(r.URL.Path, "/facebox/teach")
22+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
2223
is.Equal(r.FormValue("url"), imageURL.String())
2324
is.Equal(r.FormValue("name"), "John Lennon")
2425
is.Equal(r.FormValue("id"), "john1.jpg")
@@ -38,6 +39,7 @@ func TestTeachURLError(t *testing.T) {
3839
is.NoErr(err)
3940
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
4041
is.Equal(r.URL.Path, "/facebox/teach")
42+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
4143
is.Equal(r.FormValue("url"), imageURL.String())
4244
is.Equal(r.FormValue("name"), "John Lennon")
4345
is.Equal(r.FormValue("id"), "john1.jpg")
@@ -58,6 +60,7 @@ func TestTeachImage(t *testing.T) {
5860

5961
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
6062
is.Equal(r.URL.Path, "/facebox/teach")
63+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
6164
is.Equal(r.FormValue("name"), "John Lennon")
6265
is.Equal(r.FormValue("id"), "john1.jpg")
6366
f, _, err := r.FormFile("file")
@@ -83,6 +86,7 @@ func TestTeachImageError(t *testing.T) {
8386

8487
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
8588
is.Equal(r.URL.Path, "/facebox/teach")
89+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
8690
is.Equal(r.FormValue("name"), "John Lennon")
8791
is.Equal(r.FormValue("id"), "john1.jpg")
8892
f, _, err := r.FormFile("file")

‎facebox/facebox_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ func TestInfo(t *testing.T) {
1515
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
1616
is.Equal(r.Method, "GET")
1717
is.Equal(r.URL.Path, "/info")
18+
is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
1819
io.WriteString(w, `{
1920
"name": "facebox",
2021
"version": 1,

‎nudebox/nudebox.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ func (c *Client) CheckURL(imageURL *url.URL) (float64, error) {
116116
if err != nil {
117117
return 0, err
118118
}
119+
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
119120
req.Header.Set("Accept", "application/json; charset=utf-8")
120121
resp, err := c.HTTPClient.Do(req)
121122
if err != nil {

0 commit comments

Comments
 (0)