Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix test

goenning99788a3bf912
diff --git a/.test.env b/.test.env
index bf0d78694..7dd11193e 100644
--- a/.test.env
+++ b/.test.env
@@ -1,5 +1,5 @@
GO_ENV=test
HOST_MODE=multi
DATABASE_URL=postgres://fider_test:fider_test-pw@localhost:5566/fider_test?sslmode=disable
-AUTH_ENDPOINT=http://login.test.fider.io.com:3000
+AUTH_ENDPOINT=http://login.test.fider.io:3000
JWT_SECRET=I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a22d57a1f..793f61a5d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -28,7 +28,7 @@
"GO_ENV": "test",
"HOST_MODE": "multi",
"DATABASE_URL": "postgres://fider_test:fider_test-pw@localhost:5566/fider_test?sslmode=disable",
- "AUTH_ENDPOINT": "http://login.test.fider.io.com:3000",
+ "AUTH_ENDPOINT": "http://login.test.fider.io:3000",
"JWT_SECRET": "I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ"
}
}
\ No newline at end of file
diff --git a/app/handlers/identity_test.go b/app/handlers/identity_test.go
index e8a1b3f6f..72ade49af 100644
--- a/app/handlers/identity_test.go
+++ b/app/handlers/identity_test.go
@@ -46,11 +46,11 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io.com")
+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io")
code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io.com"))
+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io"))
}
func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
@@ -70,11 +70,11 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
})
server := mock.NewServer()
- server.Context.Request().URL, _ = url.Parse("http://demo.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io.com&code=123")
+ server.Context.Request().URL, _ = url.Parse("http://demo.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=123")
code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))
+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))
}
func TestCallbackHandler_NewUser(t *testing.T) {
@@ -83,7 +83,7 @@ func TestCallbackHandler_NewUser(t *testing.T) {
tenants.Add(tenant)
server := mock.NewServer()
- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io.com&code=456")
+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io&code=456")
code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))
user, err := users.GetByEmail(tenant.ID, "[email protected]")
@@ -91,14 +91,14 @@ func TestCallbackHandler_NewUser(t *testing.T) {
Expect(user.Name).To(Equal("Some Facebook Guy"))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.PGavs5a6HRotRozfXfNP39JPb0vSus_8LL9MAOeLGDs"))
+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.PGavs5a6HRotRozfXfNP39JPb0vSus_8LL9MAOeLGDs"))
}
func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io.com&code=123")
+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=123")
code, response := server.Execute(oauthHandlers.Callback(oauth.GoogleProvider))
tenant, _ := tenants.GetByDomain("demo")
@@ -107,5 +107,5 @@ func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {
Expect(len(user.Providers)).To(Equal(2))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))
+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))
}
diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.go
index dc5071f61..e17706340 100644
--- a/app/middlewares/domain_test.go
+++ b/app/middlewares/domain_test.go
@@ -19,16 +19,16 @@ var testCases = []struct {
{
"The Orange Inc.",
[]string{
- "orange.test.fider.io.com",
- "orange.test.fider.io.com:3000",
+ "orange.test.fider.io",
+ "orange.test.fider.io:3000",
},
},
{
"Demonstration",
[]string{
- "demo.test.fider.io.com",
- "demo.test.fider.io.com:1231",
- "demo.test.fider.io.com:80",
+ "demo.test.fider.io",
+ "demo.test.fider.io:1231",
+ "demo.test.fider.io:80",
},
},
}
@@ -62,7 +62,7 @@ func TestMultiTenant_AuthDomain(t *testing.T) {
tenants := &inmemory.TenantStorage{}
server := mock.NewServer()
- server.Context.Request().Host = "login.test.fider.io.com"
+ server.Context.Request().Host = "login.test.fider.io"
server.Use(middlewares.MultiTenant(tenants))
status, _ := server.Execute(func(c web.Context) error {
@@ -115,9 +115,9 @@ func TestHostChecker(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
- server.Context.Request().Host = "login.test.fider.io.com"
+ server.Context.Request().Host = "login.test.fider.io"
- server.Use(middlewares.HostChecker("login.test.fider.io.com"))
+ server.Use(middlewares.HostChecker("login.test.fider.io"))
status, _ := server.Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -129,8 +129,8 @@ func TestHostChecker_DifferentHost(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
- server.Context.Request().Host = "orange.test.fider.io.com"
- server.Use(middlewares.HostChecker("login.test.fider.io.com"))
+ server.Context.Request().Host = "orange.test.fider.io"
+ server.Use(middlewares.HostChecker("login.test.fider.io"))
status, _ := server.Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.go
index 4535a96b7..8309595b8 100644
--- a/app/middlewares/jwt_test.go
+++ b/app/middlewares/jwt_test.go
@@ -94,7 +94,7 @@ func TestJwtSetter_WithoutJwt(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
- server.Context.Request().Host = "orange.test.fider.io.com"
+ server.Context.Request().Host = "orange.test.fider.io"
server.Context.Request().RequestURI = "/abc"
server.Use(middlewares.JwtSetter())
@@ -113,7 +113,7 @@ func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {
})
server := mock.NewServer()
- server.Context.Request().Host = "orange.test.fider.io.com"
+ server.Context.Request().Host = "orange.test.fider.io"
server.Context.Request().URL, _ = url.Parse("/abc?jwt=" + token)
server.Use(middlewares.JwtSetter())
@@ -122,7 +122,7 @@ func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {
})
Expect(status).To(Equal(http.StatusTemporaryRedirect))
- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io.com/abc"))
+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io/abc"))
}
func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {
@@ -133,7 +133,7 @@ func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {
})
server := mock.NewServer()
- server.Context.Request().Host = "orange.test.fider.io.com"
+ server.Context.Request().Host = "orange.test.fider.io"
server.Context.Request().URL, _ = url.Parse("/abc?jwt=" + token + "&foo=bar")
server.Use(middlewares.JwtSetter())
@@ -142,5 +142,5 @@ func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {
})
Expect(status).To(Equal(http.StatusTemporaryRedirect))
- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io.com/abc?foo=bar"))
+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io/abc?foo=bar"))
}
diff --git a/app/pkg/oauth/http_test.go b/app/pkg/oauth/http_test.go
index f651fde98..43695c8b1 100644
--- a/app/pkg/oauth/http_test.go
+++ b/app/pkg/oauth/http_test.go
@@ -11,16 +11,16 @@ func TestGetAuthURL_Facebook(t *testing.T) {
RegisterTestingT(t)
svc := &oauth.HTTPService{}
- authURL := svc.GetAuthURL("http://login.test.fider.io.com:3000", oauth.FacebookProvider, "")
+ authURL := svc.GetAuthURL("http://login.test.fider.io:3000", oauth.FacebookProvider, "")
- Expect(authURL).To(Equal("https://www.facebook.com/dialog/oauth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.fider.io.com%3A3000%2Foauth%2Ffacebook%2Fcallback&response_type=code&scope=public_profile+email&state="))
+ Expect(authURL).To(Equal("https://www.facebook.com/dialog/oauth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.fider.io%3A3000%2Foauth%2Ffacebook%2Fcallback&response_type=code&scope=public_profile+email&state="))
}
func TestGetAuthURL_Google(t *testing.T) {
RegisterTestingT(t)
svc := &oauth.HTTPService{}
- authURL := svc.GetAuthURL("http://login.test.fider.io.com:3000", oauth.GoogleProvider, "")
+ authURL := svc.GetAuthURL("http://login.test.fider.io:3000", oauth.GoogleProvider, "")
- Expect(authURL).To(Equal("https://accounts.google.com/o/oauth2/auth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.fider.io.com%3A3000%2Foauth%2Fgoogle%2Fcallback&response_type=code&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email&state="))
+ Expect(authURL).To(Equal("https://accounts.google.com/o/oauth2/auth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.fider.io%3A3000%2Foauth%2Fgoogle%2Fcallback&response_type=code&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email&state="))
}