Open platform to collect and prioritize feedback
more tests and codeconv
goenning8125092091ca
diff --git a/.gitignore b/.gitignoreindex 778e911b5..cb64f4d1b 100644--- a/.gitignore+++ b/.gitignore@@ -10,4 +10,7 @@ gin-bingin-bin.exegin-bin.exe~.env-npm-debug.log\ No newline at end of file+npm-debug.log++coverage.txt+profile.out\ No newline at end of filediff --git a/.travis.yml b/.travis.ymlindex aca18de9a..852df9a90 100644--- a/.travis.yml+++ b/.travis.yml@@ -15,7 +15,6 @@ env:install:- nvm install "$(jq -r '.engines.node' package.json)"- npm i -g yarn- - go get github.com/mattn/goveralls- go get github.com/joho/godotenv/cmd/godotenv- docker-compose up -d pgtest- yarn@@ -24,8 +23,9 @@ script:- npm run lint- npm run build- make test- - godotenv -f .test.env goveralls -service=travis-ci+ - make coverageafter_success:+ - bash <(curl -s https://codecov.io/bash)- docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"- make dockerize\ No newline at end of filediff --git a/Makefile b/Makefileindex 59ce188b6..eeb982cd6 100644--- a/Makefile+++ b/Makefile@@ -17,6 +17,16 @@ ifeq ($(TRAVIS_PULL_REQUEST), false)docker push wecanhearyou/wechyendif+coverage:+ rm -rf coverage.txt+ for d in $$(go list ./... | grep -v vendor); do \+ godotenv -f .test.env go test -p=1 -race -coverprofile=profile.out -covermode=atomic $$d ; \+ if [ -f profile.out ]; then \+ cat profile.out >> coverage.txt ; \+ rm profile.out ; \+ fi \+ done+build:go build -ldflags='-X main.buildtime=${BUILD_TIME}'diff --git a/app/dbx/dbx.go b/app/dbx/dbx.goindex ab15151b0..0b54c65c5 100644--- a/app/dbx/dbx.go+++ b/app/dbx/dbx.go@@ -38,6 +38,17 @@ func (db Database) Execute(command string, args ...interface{}) error {return nil}+// QueryInt executes given SQL command and return first integer of first row+func (db Database) QueryInt(command string, args ...interface{}) (int, error) {+ var data int+ row := db.conn.QueryRow(command, args...)+ err := row.Scan(&data)+ if err != nil {+ return 0, err+ }+ return data, nil+}+// Query the database with given SQL commandfunc (db Database) Query(command string, args ...interface{}) (*sql.Rows, error) {return db.conn.Query(command, args...)@@ -52,8 +63,8 @@ func (db Database) QueryRow(command string, args ...interface{}) *sql.Row {func (db Database) Exists(command string, args ...interface{}) (bool, error) {rows, err := db.conn.Query(command, args...)if rows != nil {- rows.Close()- return true, nil+ defer rows.Close()+ return rows.Next(), nil}return false, err}diff --git a/app/identity/handler_test.go b/app/identity/handler_test.goindex 988cd25d9..d85200079 100644--- a/app/identity/handler_test.go+++ b/app/identity/handler_test.go@@ -43,8 +43,10 @@ func (p OAuthService) GetProfile(provider string, code string) (*identity.OAuthUreturn nil, nil}+var db *dbx.Database+func handlers() identity.OAuthHandlers {- db, _ := dbx.New()+ db, _ = dbx.New()oauth := &OAuthService{}tenant := &postgres.TenantService{DB: db}@@ -101,6 +103,9 @@ func TestCallbackHandler_NewUser(t *testing.T) {server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.canhearyou.com&code=456")code, response := server.ExecuteRaw(handlers().Callback(identity.OAuthFacebookProvider))+ Expect(db.QueryInt("SELECT tenant_id FROM users WHERE email = '[email protected]'")).To(Equal(400))+ Expect(db.Exists("SELECT * FROM user_providers WHERE provider_uid = 'FB5678'")).To(BeTrue())+Expect(code).To(Equal(http.StatusTemporaryRedirect))Expect(response.Header.Get("Location")).To(Equal("http://orange.test.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20iLCJ0ZW5hbnQvaWQiOjQwMH0.iWkpvh11QrUDJQnTk9PtqW6m48DnaHbsj-lbl6feK-Q"))}