refactoring + tests for web

pull/9/head
Niko Abeler 6 months ago
parent 52ce044f88
commit 08328e1000
  1. 23
      cmd/owl-web/handler.go
  2. 148
      cmd/owl-web/handler_test.go
  3. 6
      cmd/owl-web/main.go
  4. 2
      embed/user-list.html
  5. 10
      post.go
  6. 33
      post_test.go
  7. 4
      user.go
  8. 7
      user_test.go

@ -0,0 +1,23 @@
package main
import (
"h4kor/owl-blogs"
"net/http"
"github.com/julienschmidt/httprouter"
)
func RepoIndexHandler(repo owl.Repository) func(http.ResponseWriter, *http.Request, httprouter.Params) {
return func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
html, err := owl.RenderUserList(repo)
if err != nil {
println("Error rendering index: ", err.Error())
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte("Internal server error"))
return
}
println("Rendering index")
w.Write([]byte(html))
}
}

@ -0,0 +1,148 @@
package main_test
import (
"h4kor/owl-blogs"
"h4kor/owl-blogs/cmd/owl-web"
"math/rand"
"net/http"
"net/http/httptest"
"os"
"path"
"strings"
"testing"
"time"
)
func randomName() string {
rand.Seed(time.Now().UnixNano())
var letters = []rune("abcdefghijklmnopqrstuvwxyz")
b := make([]rune, 8)
for i := range b {
b[i] = letters[rand.Intn(len(letters))]
}
return string(b)
}
func testRepoName() string {
return "/tmp/" + randomName()
}
func getTestRepo() owl.Repository {
repo, _ := owl.CreateRepository(testRepoName())
return repo
}
func TestRepoIndexHandler(t *testing.T) {
repo := getTestRepo()
repo.CreateUser("user_1")
repo.CreateUser("user_2")
// Create Request and Response
req, err := http.NewRequest("GET", "/", nil)
if err != nil {
t.Fatal(err)
}
rr := httptest.NewRecorder()
router := main.Router(repo)
router.ServeHTTP(rr, req)
// Check the status code is what we expect.
if status := rr.Code; status != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v",
status, http.StatusOK)
}
// Check the response body contains names of users
if !strings.Contains(rr.Body.String(), "user_1") {
t.Error("user_1 not listed on index page. Got: ")
t.Error(rr.Body.String())
}
if !strings.Contains(rr.Body.String(), "user_2") {
t.Error("user_2 not listed on index page. Got: ")
t.Error(rr.Body.String())
}
}
func TestUserIndexHandler(t *testing.T) {
repo := getTestRepo()
user, _ := repo.CreateUser("test-1")
user.CreateNewPost("post-1")
// Create Request and Response
req, err := http.NewRequest("GET", user.UrlPath(), nil)
if err != nil {
t.Fatal(err)
}
rr := httptest.NewRecorder()
router := main.Router(repo)
router.ServeHTTP(rr, req)
// Check the status code is what we expect.
if status := rr.Code; status != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v",
status, http.StatusOK)
}
// Check the response body contains names of users
if !strings.Contains(rr.Body.String(), "post-1") {
t.Error("post-1 not listed on index page. Got: ")
t.Error(rr.Body.String())
}
}
func TestPostHandler(t *testing.T) {
repo := getTestRepo()
user, _ := repo.CreateUser("test-1")
post, _ := user.CreateNewPost("post-1")
// Create Request and Response
req, err := http.NewRequest("GET", post.UrlPath(), nil)
if err != nil {
t.Fatal(err)
}
rr := httptest.NewRecorder()
router := main.Router(repo)
router.ServeHTTP(rr, req)
// Check the status code is what we expect.
if status := rr.Code; status != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v",
status, http.StatusOK)
}
}
func TestPostMediaHandler(t *testing.T) {
repo := getTestRepo()
user, _ := repo.CreateUser("test-1")
post, _ := user.CreateNewPost("post-1")
// Create test media file
path := path.Join(post.MediaDir(), "data.txt")
println("Creating test media file:", path)
err := os.WriteFile(path, []byte("test"), 0644)
if err != nil {
t.Fatal(err)
}
// Create Request and Response
println(post.UrlMediaPath("data.txt"))
req, err := http.NewRequest("GET", post.UrlMediaPath("data.txt"), nil)
if err != nil {
t.Fatal(err)
}
rr := httptest.NewRecorder()
router := main.Router(repo)
router.ServeHTTP(rr, req)
// Check the status code is what we expect.
if status := rr.Code; status != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v",
status, http.StatusOK)
}
// Check the response body contains data of media file
if !(rr.Body.String() == "test") {
t.Error("Got wrong media file content. Expected 'test' Got: ")
t.Error(rr.Body.String())
}
}

@ -84,6 +84,12 @@ func postMediaHandler(repo owl.Repository) func(http.ResponseWriter, *http.Reque
return
}
filepath = path.Join(post.MediaDir(), filepath)
if _, err := os.Stat(filepath); err != nil {
println("Error getting file: ", err.Error())
w.WriteHeader(http.StatusNotFound)
w.Write([]byte("File not found"))
return
}
http.ServeFile(w, r, filepath)
}
}

@ -1,7 +1,7 @@
{{range .}}
<ul>
<li>
<a href="{{ .Path }}">
<a href="{{ .UrlPath }}">
{{ .Name }}
</a>
</li>

@ -17,6 +17,10 @@ type Post struct {
title string
}
func (post Post) Id() string {
return post.id
}
func (post Post) Dir() string {
return path.Join(post.user.Dir(), "public", post.id)
}
@ -26,7 +30,11 @@ func (post Post) MediaDir() string {
}
func (post Post) UrlPath() string {
return post.user.Path() + "/posts/" + post.id
return post.user.UrlPath() + "posts/" + post.id + "/"
}
func (post Post) UrlMediaPath(filename string) string {
return post.UrlPath() + "media/" + filename
}
func (post Post) Title() string {

@ -22,3 +22,36 @@ func TestMediaDir(t *testing.T) {
t.Error("Wrong MediaDir. Got: " + result)
}
}
func TestPostUrlPath(t *testing.T) {
user := getTestUser()
post, _ := user.CreateNewPost("testpost")
expected := "/user/" + user.Name() + "/posts/" + post.Id() + "/"
if !(post.UrlPath() == expected) {
t.Error("Wrong url path")
t.Error("Expected: " + expected)
t.Error(" Got: " + post.UrlPath())
}
}
func TestPostUrlMediaPath(t *testing.T) {
user := getTestUser()
post, _ := user.CreateNewPost("testpost")
expected := "/user/" + user.Name() + "/posts/" + post.Id() + "/media/data.png"
if !(post.UrlMediaPath("data.png") == expected) {
t.Error("Wrong url path")
t.Error("Expected: " + expected)
t.Error(" Got: " + post.UrlPath())
}
}
func TestPostUrlMediaPathWithSubDir(t *testing.T) {
user := getTestUser()
post, _ := user.CreateNewPost("testpost")
expected := "/user/" + user.Name() + "/posts/" + post.Id() + "/media/foo/data.png"
if !(post.UrlMediaPath("foo/data.png") == expected) {
t.Error("Wrong url path")
t.Error("Expected: " + expected)
t.Error(" Got: " + post.UrlPath())
}
}

@ -25,8 +25,8 @@ func (user User) Dir() string {
return path.Join(user.repo.UsersDir(), user.name)
}
func (user User) Path() string {
return "/user/" + user.name
func (user User) UrlPath() string {
return "/user/" + user.name + "/"
}
func (user User) PostDir() string {

@ -138,3 +138,10 @@ func TestCanLoadPost(t *testing.T) {
t.Error("Wrong title, Got: " + post.Title())
}
}
func TestUserUrlPath(t *testing.T) {
user := getTestUser()
if !(user.UrlPath() == "/user/"+user.Name()+"/") {
t.Error("Wrong url path, Expected: " + "/user/" + user.Name() + "/" + " Got: " + user.UrlPath())
}
}

Loading…
Cancel
Save