mmm-go / partner · 提交

转到一个项目

作者 yangfu
提交 8fa6ec1f0f4f10bc1980e42ed6d3a61db35c3175 1 个父辈 3061c23f

1.短信 权限认证修改

内嵌 并排对比
正在显示 7 个修改的文件 包含 0 行增加 和 265 行删除
... ... @@ -3,31 +3,10 @@ module gitlab.fjmaimaimai.com/mmm-go/partner
go 1.14
require (
github.com/ajg/form v1.5.1 // indirect
github.com/astaxie/beego v1.12.1
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/gavv/httpexpect v2.0.0+incompatible
github.com/go-pg/pg/v10 v10.0.0-beta.2
github.com/google/go-querystring v1.0.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/imkira/go-interpol v1.1.0 // indirect
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
github.com/linmadan/egglib-go v0.0.0-20191217144343-ca4539f95bf9
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/moul/http2curl v1.0.0 // indirect
github.com/onsi/ginkgo v1.10.3
github.com/onsi/gomega v1.7.1
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/tiptok/gocomm v0.0.0-20190919092013-c230743f8095
github.com/valyala/fasthttp v1.14.0 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
github.com/yudai/gojsondiff v1.0.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/yudai/pp v2.0.1+incompatible // indirect
)
... ...
package partnerInfo
import (
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/pg"
"net/http"
)
var _ = Describe("创建新合伙人", func() {
Describe("创建新合伙人", func() {
Context("创建新合伙人", func() {
It("返回合伙人数据", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{
"partnerName": "employeeName",
"account": "account123",
"password": "password",
"status": 1,
"partnerCategory": 1,
//"createAt":time.Now(),
//"updateAt":time.Now(),
"salesman": []map[string]interface{}{
{"name": "name", "telephone": "18860183051"},
{"name2": "name", "telephone": "18860183052j"},
},
}
httpExpect.POST("/partnerInfos").
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object().
ContainsKey("id").ValueNotEqual("id", BeZero())
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM partner_infos WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
package partnerInfo
import (
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/pg"
"net/http"
)
var _ = Describe("删除合伙人", func() {
BeforeEach(func() {
_, err := pG.DB.Exec(`INSERT INTO "public"."partner_infos"("id", "partner_name", "account", "password", "status", "partner_category", "create_at", "update_at", "salesman") VALUES (2929531956394199040, 'employeeName', 'account', 'password', 1, 1, '2020-06-19 15:23:31.616934+08', '2020-06-19 15:23:31.616934+08', '[{"name": "name", "telephone": "18860183051"}, {"name": "", "telephone": "18860183052j"}]');`)
Expect(err).NotTo(HaveOccurred())
})
Describe("删除合伙人", func() {
Context("删除合伙人", func() {
It("删除合伙人数据", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{}
httpExpect.DELETE("/partnerInfos/2929531956394199040").
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object().
ContainsKey("id").ValueNotEqual("id", BeZero())
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM partner_infos WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
package partnerInfo
import (
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/pg"
"net/http"
)
var _ = Describe("获取合伙人", func() {
BeforeEach(func() {
_, err := pG.DB.Exec(`INSERT INTO "public"."partner_infos"("id", "partner_name", "account", "password", "status", "partner_category", "create_at", "update_at", "salesman") VALUES (2929531956394199040, 'employeeName', 'account', 'password', 1, 1, '2020-06-19 15:23:31.616934+08', '2020-06-19 15:23:31.616934+08', '[{"name": "name", "telephone": "18860183051"}, {"name": "", "telephone": "18860183052j"}]');`)
Expect(err).NotTo(HaveOccurred())
})
Describe("获取合伙人", func() {
Context("获取合伙人", func() {
It("返回合伙人数据", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{}
httpExpect.GET("/partnerInfos/2929531956394199040").
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object().
ContainsKey("id").ValueNotEqual("id", BeZero())
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM partner_infos WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
package partnerInfo
import (
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/pg"
"net/http"
)
var _ = Describe("获取合伙人列表", func() {
BeforeEach(func() {
_, err := pG.DB.Exec(`INSERT INTO "public"."partner_infos"("id", "partner_name", "account", "password", "status", "partner_category", "create_at", "update_at", "salesman") VALUES (2929531956394199040, 'employeeName', 'account', 'password', 1, 1, '2020-06-19 15:23:31.616934+08', '2020-06-19 15:23:31.616934+08', '[{"name": "name", "telephone": "18860183051"}, {"name": "", "telephone": "18860183052j"}]');`)
Expect(err).NotTo(HaveOccurred())
})
Describe("获取合伙人列表", func() {
Context("获取合伙人列表", func() {
It("获取合伙人列表", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{}
httpExpect.GET("/partnerInfos").
WithQuery("partnerCategory", 1).
WithQuery("status", 1).
WithQuery("status", 1).
WithQuery("sortByCreateTime", "DESC").
WithQuery("sortByUpdateTime", "DESC").
WithQuery("offset", 0).
WithQuery("limit", 20).
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object().ContainsKey("partnerInfos")
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM partner_infos WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
package partnerInfo
import (
"github.com/astaxie/beego"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"net/http"
"net/http/httptest"
"testing"
_ "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/pg"
_ "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/port/beego"
)
func TestPartnerInfo(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Beego Port Employee Correlations Test Case Suite")
}
var handler http.Handler
var server *httptest.Server
var _ = BeforeSuite(func() {
handler = beego.BeeApp.Handlers
server = httptest.NewServer(handler)
})
var _ = AfterSuite(func() {
server.Close()
})
package partnerInfo
import (
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/pg"
"net/http"
)
var _ = Describe("创建新合伙人", func() {
BeforeEach(func() {
_, err := pG.DB.Exec(`INSERT INTO "public"."partner_infos"("id", "partner_name", "account", "password", "status", "partner_category", "create_at", "update_at", "salesman") VALUES (2929531956394199040, 'employeeName', 'account', 'password', 1, 1, '2020-06-19 15:23:31.616934+08', '2020-06-19 15:23:31.616934+08', '[{"name": "name", "telephone": "18860183051"}, {"name": "", "telephone": "18860183052j"}]');`)
Expect(err).NotTo(HaveOccurred())
})
Describe("创建新合伙人", func() {
Context("创建新合伙人", func() {
It("返回合伙人数据", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{
"partnerName": "employeeName",
"account": "account123",
"password": "password",
"status": 1,
"partnerCategory": 1,
"salesman": []map[string]interface{}{
{"name": "name", "telephone": "18860183051"},
{"name2": "name", "telephone": "18860183052j"},
},
}
httpExpect.PUT("/partnerInfos/2929531956394199040").
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object().
ContainsKey("id").ValueNotEqual("id", BeZero())
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM partner_infos WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})