OK NEW SERVER PASSES TESTS WOO

This commit is contained in:
Bel LaPointe
2022-02-09 14:46:06 -07:00
parent dc6df3f0bf
commit 15e6b62251
2 changed files with 34 additions and 18 deletions

View File

@@ -1,8 +1,11 @@
package main
import (
"bytes"
"encoding/json"
"net/http"
"net/http/httptest"
"net/url"
"path"
"strings"
"testing"
@@ -104,20 +107,18 @@ func TestServerRoutes(t *testing.T) {
}
}
/*
func TestServerPutTreeGetFile(t *testing.T) {
server := NewServer(t.TempDir())
if err := server.Routes(); err != nil {
t.Fatal(err)
}
server.tree().Put("my pid", Branch{})
server.tree().Put([]string{"my pid"}, Leaf{})
var id string
t.Run("put to create an id", func(t *testing.T) {
r := httptest.NewRequest(http.MethodPut, "/my-put-id", strings.NewReader("body"))
r := httptest.NewRequest(http.MethodPut, "/my%20pid/my-put-id", strings.NewReader("body"))
r.Header.Set("Title", "my put title")
r.Header.Set("PID", "my pid")
w := httptest.NewRecorder()
if err := server.apiV0FilesIDHandler(w, r); err != nil {
if err := server.apiV0FilesIDPutHandler(w, r); err != nil {
t.Fatal(err)
}
t.Logf("%s", w.Body.Bytes())
@@ -137,9 +138,8 @@ func TestServerPutTreeGetFile(t *testing.T) {
}
})
t.Run("post", func(t *testing.T) {
r := httptest.NewRequest(http.MethodPost, "/", strings.NewReader("body"))
r := httptest.NewRequest(http.MethodPost, "/my%20pid", strings.NewReader("body"))
r.Header.Set("Title", "my title")
r.Header.Set("PID", "my pid")
w := httptest.NewRecorder()
if err := server.apiV0FilesHandler(w, r); err != nil {
t.Fatal(err)
@@ -156,7 +156,7 @@ func TestServerPutTreeGetFile(t *testing.T) {
if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
t.Fatal(err)
}
id = path.Base(resp.Data.FilePath)
id = strings.TrimPrefix(resp.Data.FilePath, "/api/v0/files/")
})
t.Run("tree", func(t *testing.T) {
r := httptest.NewRequest(http.MethodGet, "/", nil)
@@ -168,15 +168,15 @@ func TestServerPutTreeGetFile(t *testing.T) {
if w.Code != http.StatusOK {
t.Fatal(w)
}
if !bytes.Contains(w.Body.Bytes(), []byte(`{"Title":"my title","Deleted":false,"Updated":"`)) {
if !bytes.Contains(w.Body.Bytes(), []byte(`{"Title":"my title","Deleted":false,"Content":"`)) {
t.Fatal(w)
}
})
t.Run("get", func(t *testing.T) {
r := httptest.NewRequest(http.MethodGet, "/"+id, nil)
r := httptest.NewRequest(http.MethodGet, "/"+url.PathEscape(id), nil)
t.Logf("%s", r.URL.String())
w := httptest.NewRecorder()
if err := server.apiV0FilesIDHandler(w, r); err != nil {
if err := server.apiV0FilesIDGetHandler(w, r); err != nil {
t.Fatal(err)
}
t.Logf("%s", w.Body.Bytes())
@@ -188,9 +188,6 @@ func TestServerPutTreeGetFile(t *testing.T) {
}
if title := w.Header().Get("Title"); title != "my title" {
t.Fatal(title)
} else if pid := w.Header().Get("PID"); pid != "my pid" {
t.Fatal(pid)
}
})
}
*/