diff --git a/Makefile b/Makefile
index d8e521d..8cb1818 100755
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,9 @@ run:
./gossa fixture
ci:
- cd src
- go fmt
- go vet
+ cd src && go vet && go fmt
timeout 5 make run &
- sleep 1 && go test
+ cd src && sleep 1 && go test
ci-watch:
ls main.go script.js main_test.go | entr -rc make ci
diff --git a/src/main_test.go b/src/main_test.go
index 2ce7f2f..164aece 100644
--- a/src/main_test.go
+++ b/src/main_test.go
@@ -65,19 +65,19 @@ func testDefaults(t *testing.T, url string) string {
t.Fatal("error header")
}
- if !strings.Contains(bodyStr, `hols/`) {
+ if !strings.Contains(bodyStr, `href="hols">hols/`) {
t.Fatal("error hols folder")
}
- if !strings.Contains(bodyStr, `curimit@gmail.com (40%)/`) {
+ if !strings.Contains(bodyStr, `href="curimit@gmail.com%20%2840%25%29">curimit@gmail.com (40%)/`) {
t.Fatal("error curimit@gmail.com (40%) folder")
}
- if !strings.Contains(bodyStr, `中文/`) {
+ if !strings.Contains(bodyStr, `href="%E4%B8%AD%E6%96%87">中文/`) {
t.Fatal("error 中文 folder")
}
- if !strings.Contains(bodyStr, ` | 0.2k | | custom_mime_type.types |
`) {
+ if !strings.Contains(bodyStr, ` | 0.2k | | custom_mime_type.types |
`) {
t.Fatal("error row custom_mime_type")
}
@@ -110,28 +110,40 @@ func TestGetFolder(t *testing.T) {
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test mkdir rpc")
- bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["%2FAAA"]}`)
+ bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["/AAA"]}`)
if !strings.Contains(bodyStr, `ok`) {
t.Fatal("error returned value")
}
bodyStr = testDefaults(t, "http://127.0.0.1:8001/")
- if !strings.Contains(bodyStr, ` | 0 | | AAA/ |
`) {
+ if !strings.Contains(bodyStr, ` | 0 | | AAA/ |
`) {
t.Fatal("error new folder created")
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test invalid mkdir rpc")
- bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["..%2FBBB"]}`)
+ bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["../BBB"]}`)
if !strings.Contains(bodyStr, `error`) {
t.Fatal("error not returned")
}
- bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["%2F..%2FBBB"]}`)
+ bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["/../BBB"]}`)
if !strings.Contains(bodyStr, `error`) {
t.Fatal("error not returned")
}
+ // ~~~~~~~~~~~~~~~~~
+ fmt.Println("\r\n~~~~~~~~~~ test mv rpc")
+ bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mv","args":["/AAA", "/hols/AAA"]}`)
+ if !strings.Contains(bodyStr, `ok`) {
+ t.Fatal("error returned value")
+ }
+
+ bodyStr = testDefaults(t, "http://127.0.0.1:8001/")
+ if strings.Contains(bodyStr, ` | 0 | | AAA/ |
`) {
+ t.Fatal("error folder moved")
+ }
+
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test post file")
bodyStr = postDummyFile(t, "http://127.0.0.1:8001/post", "%2F%E1%84%92%E1%85%A1%20%E1%84%92%E1%85%A1")
@@ -145,7 +157,7 @@ func TestGetFolder(t *testing.T) {
}
bodyStr = testDefaults(t, "http://127.0.0.1:8001/")
- if !strings.Contains(bodyStr, ` | 0.0k | | 하 하 |
`) {
+ if !strings.Contains(bodyStr, ` | 0.0k | | 하 하 |
`) {
t.Fatal("error checking new file row")
}