summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gopmfile2
-rw-r--r--README.md1
-rw-r--r--README_ZH.md1
-rw-r--r--modules/httplib/httplib_test.go206
4 files changed, 1 insertions, 209 deletions
diff --git a/.gopmfile b/.gopmfile
index 2dcf4343a8..327713ca21 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -18,7 +18,7 @@ github.com/go-xorm/core = commit:1e2868c
github.com/go-xorm/xorm = commit:24c1f3c
github.com/gogits/chardet = commit:2404f77725
github.com/gogits/git-module = commit:3b40eae
-github.com/gogits/go-gogs-client = commit:2f4342d
+github.com/gogits/go-gogs-client =
github.com/issue9/identicon = commit:f8c0d2c
github.com/kardianos/minwinsvc = commit:cad6b2b
github.com/klauspost/compress = commit:91e7b09
diff --git a/README.md b/README.md
index 728747669f..a6ffac1814 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,6 @@ There are 5 ways to install Gogs:
## Acknowledgments
- Router and middleware mechanism of [Macaron](https://github.com/go-macaron/macaron).
-- Modules design is inspired by [WeTalk](https://github.com/beego/wetalk).
- System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
- Thanks [lavachen](http://www.lavachen.cn/) and [Rocker](http://weibo.com/rocker1989) for designing Logo.
- Thanks [Crowdin](https://crowdin.com/project/gogs) for providing open source translation plan.
diff --git a/README_ZH.md b/README_ZH.md
index d786f36563..27f9306626 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -86,7 +86,6 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
## 特别鸣谢
- 基于 [Macaron](https://github.com/go-macaron/macaron) 的路由与中间件机制。
-- 基于 [WeTalk](https://github.com/beego/wetalk) 修改的模块设计。
- 基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改的系统监视状态。
- 感谢 [lavachen](http://www.lavachen.cn/) 和 [Rocker](http://weibo.com/rocker1989) 设计的 Logo。
- 感谢 [Crowdin](https://crowdin.com/project/gogs) 提供免费的开源项目本地化支持。
diff --git a/modules/httplib/httplib_test.go b/modules/httplib/httplib_test.go
deleted file mode 100644
index e3f6b5d409..0000000000
--- a/modules/httplib/httplib_test.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2013 The Beego Authors. All rights reserved.
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package httplib
-
-import (
- "io/ioutil"
- "os"
- "strings"
- "testing"
-)
-
-func TestResponse(t *testing.T) {
- req := Get("http://httpbin.org/get")
- resp, err := req.Response()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(resp)
-}
-
-func TestGet(t *testing.T) {
- req := Get("http://httpbin.org/get")
- b, err := req.Bytes()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(b)
-
- s, err := req.String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(s)
-
- if string(b) != s {
- t.Fatal("request data not match")
- }
-}
-
-func TestSimplePost(t *testing.T) {
- v := "smallfish"
- req := Post("http://httpbin.org/post")
- req.Param("username", v)
-
- str, err := req.String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
-
- n := strings.Index(str, v)
- if n == -1 {
- t.Fatal(v + " not found in post")
- }
-}
-
-// func TestPostFile(t *testing.T) {
-// v := "smallfish"
-// req := Post("http://httpbin.org/post")
-// req.Param("username", v)
-// req.PostFile("uploadfile", "httplib_test.go")
-
-// str, err := req.String()
-// if err != nil {
-// t.Fatal(err)
-// }
-// t.Log(str)
-
-// n := strings.Index(str, v)
-// if n == -1 {
-// t.Fatal(v + " not found in post")
-// }
-// }
-
-func TestSimplePut(t *testing.T) {
- str, err := Put("http://httpbin.org/put").String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
-}
-
-func TestSimpleDelete(t *testing.T) {
- str, err := Delete("http://httpbin.org/delete").String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
-}
-
-func TestWithCookie(t *testing.T) {
- v := "smallfish"
- str, err := Get("http://httpbin.org/cookies/set?k1=" + v).SetEnableCookie(true).String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
-
- str, err = Get("http://httpbin.org/cookies").SetEnableCookie(true).String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
-
- n := strings.Index(str, v)
- if n == -1 {
- t.Fatal(v + " not found in cookie")
- }
-}
-
-func TestWithBasicAuth(t *testing.T) {
- str, err := Get("http://httpbin.org/basic-auth/user/passwd").SetBasicAuth("user", "passwd").String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
- n := strings.Index(str, "authenticated")
- if n == -1 {
- t.Fatal("authenticated not found in response")
- }
-}
-
-func TestWithUserAgent(t *testing.T) {
- v := "beego"
- str, err := Get("http://httpbin.org/headers").SetUserAgent(v).String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
-
- n := strings.Index(str, v)
- if n == -1 {
- t.Fatal(v + " not found in user-agent")
- }
-}
-
-func TestWithSetting(t *testing.T) {
- v := "beego"
- var setting BeegoHttpSettings
- setting.EnableCookie = true
- setting.UserAgent = v
- setting.Transport = nil
- SetDefaultSetting(setting)
-
- str, err := Get("http://httpbin.org/get").String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
-
- n := strings.Index(str, v)
- if n == -1 {
- t.Fatal(v + " not found in user-agent")
- }
-}
-
-func TestToJson(t *testing.T) {
- req := Get("http://httpbin.org/ip")
- resp, err := req.Response()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(resp)
-
- // httpbin will return http remote addr
- type Ip struct {
- Origin string `json:"origin"`
- }
- var ip Ip
- err = req.ToJson(&ip)
- if err != nil {
- t.Fatal(err)
- }
- t.Log(ip.Origin)
-
- if n := strings.Count(ip.Origin, "."); n != 3 {
- t.Fatal("response is not valid ip")
- }
-}
-
-func TestToFile(t *testing.T) {
- f := "beego_testfile"
- req := Get("http://httpbin.org/ip")
- err := req.ToFile(f)
- if err != nil {
- t.Fatal(err)
- }
- defer os.Remove(f)
- b, err := ioutil.ReadFile(f)
- if n := strings.Index(string(b), "origin"); n == -1 {
- t.Fatal(err)
- }
-}
-
-func TestHeader(t *testing.T) {
- req := Get("http://httpbin.org/headers")
- req.Header("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.57 Safari/537.36")
- str, err := req.String()
- if err != nil {
- t.Fatal(err)
- }
- t.Log(str)
-}