Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Internal changes to test cases (#92)

Guilherme Oenning9899d7eab856
diff --git a/.vscode/settings.json b/.vscode/settings.json
index cd5720912..fff324205 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -30,7 +30,6 @@
"vsicons.presets.angular": true,
"go.coverOnSave": true,
"go.coverageOptions": "showBothCoveredAndUncoveredCode",
- "go.coverageDecorator": "gutter",
"go.testEnvFile": "${workspaceRoot}/.test.env",
"go.lintTool": "golint"
}
\ No newline at end of file
diff --git a/app/actions/actions.go b/app/actions/actions.go
new file mode 100644
index 000000000..25b25be62
--- /dev/null
+++ b/app/actions/actions.go
@@ -0,0 +1,14 @@
+package actions
+
+import (
+ "github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/validate"
+)
+
+// Actionable is any action that the user can perform using the web app
+type Actionable interface {
+ NewModel() interface{}
+ Validate(services *app.Services) *validate.Result
+ IsAuthorized(user *models.User) bool
+}
diff --git a/app/models/im/im_test.go b/app/actions/actions_test.go
similarity index 97%
rename from app/models/im/im_test.go
rename to app/actions/actions_test.go
index fabf22a80..d4f6a7b12 100644
--- a/app/models/im/im_test.go
+++ b/app/actions/actions_test.go
@@ -1,4 +1,4 @@
-package im_test
+package actions_test
import (
"github.com/getfider/fider/app"
diff --git a/app/actions/idea.go b/app/actions/idea.go
new file mode 100644
index 000000000..62c23b3dd
--- /dev/null
+++ b/app/actions/idea.go
@@ -0,0 +1,100 @@
+package actions
+
+import (
+ "strings"
+
+ "github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/validate"
+)
+
+// CreateNewIdea is used to create a new idea
+type CreateNewIdea struct {
+ Model *models.NewIdea
+}
+
+// NewModel initializes the model
+func (input *CreateNewIdea) NewModel() interface{} {
+ input.Model = new(models.NewIdea)
+ return input.Model
+}
+
+// IsAuthorized returns true if current user is authorized to perform this action
+func (input *CreateNewIdea) IsAuthorized(user *models.User) bool {
+ return true
+}
+
+// Validate is current model is valid
+func (input *CreateNewIdea) Validate(services *app.Services) *validate.Result {
+ result := validate.Success()
+
+ input.Model.Title = strings.Trim(input.Model.Title, " ")
+
+ if input.Model.Title == "" {
+ result.AddFieldFailure("title", "Title is required.")
+ }
+
+ if len(input.Model.Title) < 10 || len(strings.Split(input.Model.Title, " ")) < 3 {
+ result.AddFieldFailure("title", "Title needs to be more descriptive.")
+ }
+
+ return result
+}
+
+// AddNewComment represents a new comment to be added
+type AddNewComment struct {
+ Model *models.NewComment
+}
+
+// NewModel initializes the model
+func (input *AddNewComment) NewModel() interface{} {
+ input.Model = new(models.NewComment)
+ return input.Model
+}
+
+// IsAuthorized returns true if current user is authorized to perform this action
+func (input *AddNewComment) IsAuthorized(user *models.User) bool {
+ return true
+}
+
+// Validate is current model is valid
+func (input *AddNewComment) Validate(services *app.Services) *validate.Result {
+ result := validate.Success()
+
+ if strings.Trim(input.Model.Content, " ") == "" {
+ result.AddFieldFailure("content", "Comment is required.")
+ }
+
+ return result
+}
+
+// SetResponse represents the action to update an idea response
+type SetResponse struct {
+ Model *models.SetResponse
+}
+
+// NewModel initializes the model
+func (input *SetResponse) NewModel() interface{} {
+ input.Model = new(models.SetResponse)
+ return input.Model
+}
+
+// IsAuthorized returns true if current user is authorized to perform this action
+func (input *SetResponse) IsAuthorized(user *models.User) bool {
+ return true
+}
+
+// Validate is current model is valid
+func (input *SetResponse) Validate(services *app.Services) *validate.Result {
+ result := validate.Success()
+
+ if input.Model.Status < models.IdeaNew || input.Model.Status > models.IdeaDeclined {
+ result.AddFieldFailure("status", "Status is invalid.")
+ }
+
+ if strings.Trim(input.Model.Text, " ") == "" {
+ result.AddFieldFailure("text", "Text is required.")
+ }
+
+ return result
+}
diff --git a/app/models/im/idea_test.go b/app/actions/idea_test.go
similarity index 62%
rename from app/models/im/idea_test.go
rename to app/actions/idea_test.go
index 6d1a8742d..595529ee2 100644
--- a/app/models/im/idea_test.go
+++ b/app/actions/idea_test.go
@@ -1,9 +1,11 @@
-package im_test
+package actions_test
import (
"testing"
- "github.com/getfider/fider/app/models/im"
+ "github.com/getfider/fider/app/actions"
+ "github.com/getfider/fider/app/models"
+
. "github.com/onsi/gomega"
)
@@ -21,8 +23,8 @@ func TestInvalidIdeaTitles(t *testing.T) {
"my+company",
"1234567890123456789012345678901234567890ABC",
} {
- idea := im.Idea{Title: title}
- result := idea.Validate(services)
+ action := &actions.CreateNewIdea{Model: &models.NewIdea{Title: title}}
+ result := action.Validate(services)
ExpectFailed(result, "title")
}
}
@@ -34,8 +36,8 @@ func TestValidIdeaTitles(t *testing.T) {
"this is my new idea",
"this idea is very descriptive",
} {
- idea := im.Idea{Title: title}
- result := idea.Validate(services)
+ action := &actions.CreateNewIdea{Model: &models.NewIdea{Title: title}}
+ result := action.Validate(services)
ExpectSuccess(result)
}
}
diff --git a/app/models/im/tenant.go b/app/actions/tenant.go
similarity index 57%
rename from app/models/im/tenant.go
rename to app/actions/tenant.go
index 07a2da4c3..01d610155 100644
--- a/app/models/im/tenant.go
+++ b/app/actions/tenant.go
@@ -1,4 +1,4 @@
-package im
+package actions
import (
"strings"
@@ -12,54 +12,60 @@ import (
//CreateTenant is the input model used to create a tenant
type CreateTenant struct {
- Token string `json:"token"`
- Name string `json:"name"`
- Subdomain string `json:"subdomain"`
- UserClaims *models.OAuthClaims
+ Model *models.CreateTenant
+}
+
+// NewModel initializes the model
+func (input *CreateTenant) NewModel() interface{} {
+ input.Model = new(models.CreateTenant)
+ return input.Model
}
// IsAuthorized returns true if current user is authorized to perform this action
-func (i *CreateTenant) IsAuthorized(user *models.User) bool {
+func (input *CreateTenant) IsAuthorized(user *models.User) bool {
return true
}
// Validate is current model is valid
-func (i *CreateTenant) Validate(services *app.Services) *validate.Result {
+func (input *CreateTenant) Validate(services *app.Services) *validate.Result {
result := validate.Success()
var err error
- if i.Token == "" {
+ if input.Model.Token == "" {
result.AddFieldFailure("token", "Please identify yourself before proceeding.")
} else {
- if i.UserClaims, err = jwt.DecodeOAuthClaims(i.Token); err != nil {
+ if input.Model.UserClaims, err = jwt.DecodeOAuthClaims(input.Model.Token); err != nil {
return validate.Error(err)
}
}
if env.IsSingleHostMode() {
- i.Subdomain = "default"
+ input.Model.Subdomain = "default"
}
- if i.Name == "" {
+ if input.Model.Name == "" {
result.AddFieldFailure("name", "Name is required.")
}
- subdomainResult := validate.Subdomain(services.Tenants, i.Subdomain)
+ subdomainResult := validate.Subdomain(services.Tenants, input.Model.Subdomain)
if !subdomainResult.Ok {
result.AddFieldFailure("subdomain", subdomainResult.Messages...)
}
- i.Subdomain = strings.ToLower(i.Subdomain)
+ input.Model.Subdomain = strings.ToLower(input.Model.Subdomain)
return result
}
//UpdateTenantSettings is the input model used to update tenant settings
type UpdateTenantSettings struct {
- Title string `json:"title"`
- Invitation string `json:"invitation"`
- WelcomeMessage string `json:"welcomeMessage"`
- UserClaims *models.OAuthClaims
+ Model *models.UpdateTenantSettings
+}
+
+// NewModel initializes the model
+func (input *UpdateTenantSettings) NewModel() interface{} {
+ input.Model = new(models.UpdateTenantSettings)
+ return input.Model
}
// IsAuthorized returns true if current user is authorized to perform this action
@@ -71,19 +77,19 @@ func (input *UpdateTenantSettings) IsAuthorized(user *models.User) bool {
func (input *UpdateTenantSettings) Validate(services *app.Services) *validate.Result {
result := validate.Success()
- input.Title = strings.Trim(input.Title, " ")
- input.Invitation = strings.Trim(input.Invitation, " ")
- input.WelcomeMessage = strings.Trim(input.WelcomeMessage, " ")
+ input.Model.Title = strings.Trim(input.Model.Title, " ")
+ input.Model.Invitation = strings.Trim(input.Model.Invitation, " ")
+ input.Model.WelcomeMessage = strings.Trim(input.Model.WelcomeMessage, " ")
- if input.Title == "" {
+ if input.Model.Title == "" {
result.AddFieldFailure("title", "Title is required.")
}
- if len(input.Title) > 60 {
+ if len(input.Model.Title) > 60 {
result.AddFieldFailure("title", "Title must have less than 60 characters.")
}
- if len(input.Invitation) > 60 {
+ if len(input.Model.Invitation) > 60 {
result.AddFieldFailure("invitation", "Invitation must have less than 60 characters.")
}
diff --git a/app/actions/tenant_test.go b/app/actions/tenant_test.go
new file mode 100644
index 000000000..4d1a1b60e
--- /dev/null
+++ b/app/actions/tenant_test.go
@@ -0,0 +1,67 @@
+package actions_test
+
+import (
+ "testing"
+
+ "github.com/getfider/fider/app/actions"
+ "github.com/getfider/fider/app/models"
+
+ . "github.com/onsi/gomega"
+)
+
+func TestCreateTenant_EmptyToken(t *testing.T) {
+ RegisterTestingT(t)
+
+ action := actions.CreateTenant{Model: &models.CreateTenant{Token: ""}}
+ result := action.Validate(services)
+ ExpectFailed(result, "token")
+}
+
+func TestCreateTenant_EmptyName(t *testing.T) {
+ RegisterTestingT(t)
+
+ action := actions.CreateTenant{Model: &models.CreateTenant{Token: jonSnowToken, Name: ""}}
+ result := action.Validate(services)
+ ExpectFailed(result, "name")
+}
+
+func TestCreateTenant_EmptySubdomain(t *testing.T) {
+ RegisterTestingT(t)
+
+ action := actions.CreateTenant{Model: &models.CreateTenant{Token: jonSnowToken, Name: "My Company"}}
+ result := action.Validate(services)
+ ExpectFailed(result, "subdomain")
+}
+
+func TestCreateTenant_UpperCaseSubdomain(t *testing.T) {
+ RegisterTestingT(t)
+
+ action := actions.CreateTenant{Model: &models.CreateTenant{Token: jonSnowToken, Name: "My Company", Subdomain: "MyCompany"}}
+ result := action.Validate(services)
+ ExpectSuccess(result)
+ Expect(action.Model.Subdomain).To(Equal("mycompany"))
+}
+
+func TestUpdateTenantSettings_EmptyTitle(t *testing.T) {
+ RegisterTestingT(t)
+
+ action := actions.UpdateTenantSettings{Model: &models.UpdateTenantSettings{}}
+ result := action.Validate(services)
+ ExpectFailed(result, "title")
+}
+
+func TestUpdateTenantSettings_LargeTitle(t *testing.T) {
+ RegisterTestingT(t)
+
+ action := actions.UpdateTenantSettings{Model: &models.UpdateTenantSettings{Title: "123456789012345678901234567890123456789012345678901234567890123"}}
+ result := action.Validate(services)
+ ExpectFailed(result, "title")
+}
+
+func TestUpdateTenantSettings_LargeInvitation(t *testing.T) {
+ RegisterTestingT(t)
+
+ action := actions.UpdateTenantSettings{Model: &models.UpdateTenantSettings{Title: "Ok", Invitation: "123456789012345678901234567890123456789012345678901234567890123"}}
+ result := action.Validate(services)
+ ExpectFailed(result, "invitation")
+}
diff --git a/app/handlers/admin.go b/app/handlers/admin.go
index 8554ee90a..72a946db3 100644
--- a/app/handlers/admin.go
+++ b/app/handlers/admin.go
@@ -1,18 +1,18 @@
package handlers
import (
- "github.com/getfider/fider/app/models/im"
+ "github.com/getfider/fider/app/actions"
"github.com/getfider/fider/app/pkg/web"
)
// UpdateSettings update current tenant' settings
func UpdateSettings() web.HandlerFunc {
return func(c web.Context) error {
- input := new(im.UpdateTenantSettings)
+ input := new(actions.UpdateTenantSettings)
if result := c.BindTo(input); !result.Ok {
return c.HandleValidation(result)
}
- err := c.Services().Tenants.UpdateSettings(c.Tenant().ID, input.Title, input.Invitation, input.WelcomeMessage)
+ err := c.Services().Tenants.UpdateSettings(c.Tenant().ID, input.Model.Title, input.Model.Invitation, input.Model.WelcomeMessage)
if err != nil {
return c.Failure(err)
}
diff --git a/app/handlers/admin_test.go b/app/handlers/admin_test.go
index 1aefff7a1..dedd5dcf9 100644
--- a/app/handlers/admin_test.go
+++ b/app/handlers/admin_test.go
@@ -3,27 +3,25 @@ package handlers_test
import (
"testing"
- "github.com/getfider/fider/app"
- "github.com/getfider/fider/app/handlers"
- "github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/mock"
- "github.com/getfider/fider/app/storage/inmemory"
+
+ "github.com/getfider/fider/app/handlers"
. "github.com/onsi/gomega"
)
func TestUpdateSettingsHandler(t *testing.T) {
RegisterTestingT(t)
- tenants := &inmemory.TenantStorage{}
- tenants.Add("Demonstration", "demo")
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Tenants: tenants})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon", Role: models.RoleAdministrator})
-
- code, _ := server.ExecutePost(handlers.UpdateSettings(), `{ "title": "GoT", "invitation": "Join us!", "welcomeMessage": "Welcome to GoT Feedback Forum" }`)
+ server, services := mock.NewServer()
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ ExecutePost(
+ handlers.UpdateSettings(),
+ `{ "title": "GoT", "invitation": "Join us!", "welcomeMessage": "Welcome to GoT Feedback Forum" }`,
+ )
- tenant, _ := tenants.GetByDomain("demo")
+ tenant, _ := services.Tenants.GetByDomain("demo")
Expect(code).To(Equal(200))
Expect(tenant.Name).To(Equal("GoT"))
Expect(tenant.Invitation).To(Equal("Join us!"))
diff --git a/app/handlers/handlers_test.go b/app/handlers/handlers_test.go
deleted file mode 100644
index 77d2009e8..000000000
--- a/app/handlers/handlers_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package handlers_test
-
-import (
- "github.com/getfider/fider/app"
- "github.com/getfider/fider/app/models"
- "github.com/getfider/fider/app/pkg/oauth"
- "github.com/getfider/fider/app/storage/inmemory"
-)
-
-var demoTenant *models.Tenant
-var orangeTenant *models.Tenant
-
-func getEmptyServices() *app.Services {
- return &app.Services{
- Tenants: &inmemory.TenantStorage{},
- Users: &inmemory.UserStorage{},
- OAuth: &MockOAuthService{},
- }
-}
-
-func getServices() *app.Services {
- services := &app.Services{
- Tenants: &inmemory.TenantStorage{},
- Users: &inmemory.UserStorage{},
- OAuth: &MockOAuthService{},
- }
-
- demoTenant, _ = services.Tenants.Add("Demonstration", "demo")
- orangeTenant, _ = services.Tenants.Add("Orange Inc.", "orange")
-
- return services
-}
-
-//MockOAuthService implements a mocked OAuthService
-type MockOAuthService struct{}
-
-//GetAuthURL returns authentication url for given provider
-func (p *MockOAuthService) GetAuthURL(authEndpoint string, provider string, redirect string) string {
- return "http://orange.test.canherayou.com/oauth/token?provider=" + provider + "&redirect=" + redirect
-}
-
-//GetProfile returns user profile based on provider and code
-func (p *MockOAuthService) GetProfile(authEndpoint string, provider string, code string) (*oauth.UserProfile, error) {
- if provider == "facebook" && code == "123" {
- return &oauth.UserProfile{
- ID: "FB123",
- Name: "Jon Snow",
- Email: "[email protected]",
- }, nil
- }
-
- if provider == "facebook" && code == "456" {
- return &oauth.UserProfile{
- ID: "FB456",
- Name: "Some Facebook Guy",
- Email: "[email protected]",
- }, nil
- }
-
- if provider == "facebook" && code == "798" {
- return &oauth.UserProfile{
- ID: "FB798",
- Name: "Mark",
- Email: "",
- }, nil
- }
-
- if provider == "google" && code == "123" {
- return &oauth.UserProfile{
- ID: "GO123",
- Name: "Jon Snow",
- Email: "[email protected]",
- }, nil
- }
-
- if provider == "google" && code == "456" {
- return &oauth.UserProfile{
- ID: "GO456",
- Name: "Bob",
- Email: "",
- }, nil
- }
-
- return nil, nil
-}
diff --git a/app/handlers/idea.go b/app/handlers/idea.go
index cf69b0e89..2b23ec83a 100644
--- a/app/handlers/idea.go
+++ b/app/handlers/idea.go
@@ -2,7 +2,7 @@ package handlers
import (
"github.com/getfider/fider/app"
- "github.com/getfider/fider/app/models/im"
+ "github.com/getfider/fider/app/actions"
"github.com/getfider/fider/app/pkg/web"
)
@@ -23,13 +23,13 @@ func Index() web.HandlerFunc {
// PostIdea creates a new idea on current tenant
func PostIdea() web.HandlerFunc {
return func(c web.Context) error {
- input := new(im.Idea)
+ input := new(actions.CreateNewIdea)
if result := c.BindTo(input); !result.Ok {
return c.HandleValidation(result)
}
ideas := c.Services().Ideas
- idea, err := ideas.Add(input.Title, input.Description, c.User().ID)
+ idea, err := ideas.Add(input.Model.Title, input.Model.Description, c.User().ID)
if err != nil {
return c.Failure(err)
}
@@ -50,14 +50,14 @@ func UpdateIdea() web.HandlerFunc {
return c.Failure(err)
}
- input := new(im.Idea)
+ input := new(actions.CreateNewIdea)
if result := c.BindTo(input); !result.Ok {
return c.HandleValidation(result)
}
idea, err := c.Services().Ideas.GetByNumber(number)
if idea.CanBeChangedBy(c.User()) {
- idea, err = c.Services().Ideas.Update(number, input.Title, input.Description)
+ idea, err = c.Services().Ideas.Update(number, input.Model.Title, input.Model.Description)
if err != nil {
return c.Failure(err)
}
@@ -101,7 +101,7 @@ func IdeaDetails() web.HandlerFunc {
// PostComment creates a new comment on given idea
func PostComment() web.HandlerFunc {
return func(c web.Context) error {
- input := new(im.NewComment)
+ input := new(actions.AddNewComment)
if result := c.BindTo(input); !result.Ok {
return c.HandleValidation(result)
}
@@ -112,7 +112,7 @@ func PostComment() web.HandlerFunc {
}
ideas := c.Services().Ideas
- _, err = ideas.AddComment(ideaNumber, input.Content, c.User().ID)
+ _, err = ideas.AddComment(ideaNumber, input.Model.Content, c.User().ID)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
@@ -127,7 +127,7 @@ func PostComment() web.HandlerFunc {
// SetResponse changes current idea staff response
func SetResponse() web.HandlerFunc {
return func(c web.Context) error {
- input := new(im.SetResponse)
+ input := new(actions.SetResponse)
if result := c.BindTo(input); !result.Ok {
return c.HandleValidation(result)
}
@@ -138,7 +138,7 @@ func SetResponse() web.HandlerFunc {
}
ideas := c.Services().Ideas
- err = ideas.SetResponse(ideaNumber, input.Text, c.User().ID, input.Status)
+ err = ideas.SetResponse(ideaNumber, input.Model.Text, c.User().ID, input.Model.Status)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
diff --git a/app/handlers/idea_test.go b/app/handlers/idea_test.go
index 795de27a1..492440b8f 100644
--- a/app/handlers/idea_test.go
+++ b/app/handlers/idea_test.go
@@ -3,25 +3,16 @@ package handlers_test
import (
"testing"
- "github.com/getfider/fider/app"
"github.com/getfider/fider/app/handlers"
- "github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/mock"
- "github.com/getfider/fider/app/pkg/web"
- "github.com/getfider/fider/app/storage/inmemory"
. "github.com/onsi/gomega"
)
func TestIndexHandler(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
-
- code, _ := server.Execute(handlers.Index())
+ server, _ := mock.NewServer()
+ code, _ := server.OnTenant(mock.DemoTenant).AsUser(mock.JonSnow).Execute(handlers.Index())
Expect(code).To(Equal(200))
}
@@ -29,15 +20,14 @@ func TestIndexHandler(t *testing.T) {
func TestDetailsHandler(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- idea, _ := ideas.Add("My Idea", "My Idea Description", 1)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParams(web.Map{"number": idea.Number})
+ server, services := mock.NewServer()
+ idea, _ := services.Ideas.Add("My Idea", "My Idea Description", mock.JonSnow.ID)
- code, _ := server.Execute(handlers.IdeaDetails())
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ WithParam("number", idea.Number).
+ Execute(handlers.IdeaDetails())
Expect(code).To(Equal(200))
}
@@ -45,14 +35,12 @@ func TestDetailsHandler(t *testing.T) {
func TestDetailsHandler_NotFound(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParams(web.Map{"number": "99"})
-
- code, _ := server.Execute(handlers.IdeaDetails())
+ server, _ := mock.NewServer()
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ WithParam("number", "99").
+ Execute(handlers.IdeaDetails())
Expect(code).To(Equal(404))
}
@@ -60,14 +48,13 @@ func TestDetailsHandler_NotFound(t *testing.T) {
func TestPostIdeaHandler(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- code, _ := server.ExecutePost(handlers.PostIdea(), `{ "title": "My newest idea :)" }`)
+ server, services := mock.NewServer()
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ ExecutePost(handlers.PostIdea(), `{ "title": "My newest idea :)" }`)
- idea, err := ideas.GetByID(1)
+ idea, err := services.Ideas.GetByID(1)
Expect(code).To(Equal(200))
Expect(err).To(BeNil())
Expect(idea.Title).To(Equal("My newest idea :)"))
@@ -77,14 +64,13 @@ func TestPostIdeaHandler(t *testing.T) {
func TestPostIdeaHandler_WithoutTitle(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- code, _ := server.ExecutePost(handlers.PostIdea(), `{ "title": "" }`)
+ server, services := mock.NewServer()
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ ExecutePost(handlers.PostIdea(), `{ "title": "" }`)
- _, err := ideas.GetByID(1)
+ _, err := services.Ideas.GetByID(1)
Expect(code).To(Equal(400))
Expect(err).NotTo(BeNil())
}
@@ -92,16 +78,16 @@ func TestPostIdeaHandler_WithoutTitle(t *testing.T) {
func TestUpdateIdeaHandler_IdeaOwner(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- idea, _ := ideas.Add("My First Idea", "With a description", 1)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParams(web.Map{"number": idea.Number})
- code, _ := server.ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
+ server, services := mock.NewServer()
+ idea, _ := services.Ideas.Add("My First Idea", "With a description", mock.AryaStark.ID)
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.AryaStark).
+ WithParam("number", idea.Number).
+ ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
- idea, _ = ideas.GetByNumber(idea.Number)
+ idea, _ = services.Ideas.GetByNumber(idea.Number)
Expect(code).To(Equal(200))
Expect(idea.Title).To(Equal("the new title"))
Expect(idea.Description).To(Equal("new description"))
@@ -110,16 +96,16 @@ func TestUpdateIdeaHandler_IdeaOwner(t *testing.T) {
func TestUpdateIdeaHandler_TenantStaff(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- idea, _ := ideas.Add("My First Idea", "With a description", 1)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 2, Name: "Jon", Role: models.RoleAdministrator})
- server.Context.SetParams(web.Map{"number": idea.Number})
- code, _ := server.ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
+ server, services := mock.NewServer()
+ idea, _ := services.Ideas.Add("My First Idea", "With a description", mock.AryaStark.ID)
- idea, _ = ideas.GetByNumber(idea.Number)
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ WithParam("number", idea.Number).
+ ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
+
+ idea, _ = services.Ideas.GetByNumber(idea.Number)
Expect(code).To(Equal(200))
Expect(idea.Title).To(Equal("the new title"))
Expect(idea.Description).To(Equal("new description"))
@@ -128,14 +114,14 @@ func TestUpdateIdeaHandler_TenantStaff(t *testing.T) {
func TestUpdateIdeaHandler_NonAuthorized(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- idea, _ := ideas.Add("My First Idea", "With a description", 1)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 2, Name: "Jon"})
- server.Context.SetParams(web.Map{"number": idea.Number})
- code, _ := server.ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
+ server, services := mock.NewServer()
+ idea, _ := services.Ideas.Add("My First Idea", "With a description", mock.JonSnow.ID)
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.AryaStark).
+ WithParam("number", idea.Number).
+ ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
Expect(code).To(Equal(401))
}
@@ -143,15 +129,14 @@ func TestUpdateIdeaHandler_NonAuthorized(t *testing.T) {
func TestPostCommentHandler(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- idea, _ := ideas.Add("My First Idea", "With a description", 1)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParams(web.Map{"number": idea.Number})
- handler := handlers.PostComment()
- code, _ := server.ExecutePost(handler, `{ "content": "This is a comment!" }`)
+ server, services := mock.NewServer()
+ idea, _ := services.Ideas.Add("My First Idea", "With a description", mock.JonSnow.ID)
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ WithParam("number", idea.Number).
+ ExecutePost(handlers.PostComment(), `{ "content": "This is a comment!" }`)
Expect(code).To(Equal(200))
}
@@ -159,14 +144,14 @@ func TestPostCommentHandler(t *testing.T) {
func TestPostCommentHandler_WithoutContent(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParams(web.Map{"number": "1"})
- handler := handlers.PostComment()
- code, _ := server.ExecutePost(handler, `{ "content": "" }`)
+ server, services := mock.NewServer()
+ idea, _ := services.Ideas.Add("My First Idea", "With a description", mock.JonSnow.ID)
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ WithParam("number", idea.Number).
+ ExecutePost(handlers.PostComment(), `{ "content": "" }`)
Expect(code).To(Equal(400))
}
@@ -174,18 +159,18 @@ func TestPostCommentHandler_WithoutContent(t *testing.T) {
func TestAddSupporterHandler(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- ideas.Add("The Idea #1", "The Description #1", 1)
- ideas.Add("The Idea #2", "The Description #2", 1)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 2, Name: "Arya"})
- server.Context.SetParams(web.Map{"number": "2"})
+ server, services := mock.NewServer()
+ first, _ := services.Ideas.Add("The Idea #1", "The Description #1", mock.JonSnow.ID)
+ second, _ := services.Ideas.Add("The Idea #2", "The Description #2", mock.JonSnow.ID)
+
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.AryaStark).
+ WithParam("number", second.Number).
+ Execute(handlers.AddSupporter())
- code, _ := server.Execute(handlers.AddSupporter())
- first, _ := ideas.GetByNumber(1)
- second, _ := ideas.GetByNumber(2)
+ first, _ = services.Ideas.GetByNumber(1)
+ second, _ = services.Ideas.GetByNumber(2)
Expect(code).To(Equal(200))
Expect(first.TotalSupporters).To(Equal(0))
@@ -195,14 +180,12 @@ func TestAddSupporterHandler(t *testing.T) {
func TestAddSupporterHandler_InvalidIdea(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParams(web.Map{"number": "1"})
-
- code, _ := server.Execute(handlers.AddSupporter())
+ server, _ := mock.NewServer()
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.AryaStark).
+ WithParam("number", 999).
+ Execute(handlers.AddSupporter())
Expect(code).To(Equal(404))
}
@@ -210,20 +193,19 @@ func TestAddSupporterHandler_InvalidIdea(t *testing.T) {
func TestRemoveSupporterHandler(t *testing.T) {
RegisterTestingT(t)
- ideas := &inmemory.IdeaStorage{}
- idea, _ := ideas.Add("The Idea #1", "The Description #1", 1)
- ideas.AddSupporter(1, 1)
- ideas.AddSupporter(1, 2)
- ideas.AddSupporter(1, 3)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{Ideas: ideas})
- server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
- server.Context.SetUser(&models.User{ID: 2, Name: "Arya"})
- server.Context.SetParams(web.Map{"number": idea.Number})
+ server, services := mock.NewServer()
+ idea, _ := services.Ideas.Add("The Idea #1", "The Description #1", mock.JonSnow.ID)
+ services.Ideas.AddSupporter(idea.Number, mock.JonSnow.ID)
+ services.Ideas.AddSupporter(idea.Number, mock.AryaStark.ID)
- code, _ := server.Execute(handlers.RemoveSupporter())
- idea, _ = ideas.GetByNumber(idea.Number)
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.AryaStark).
+ WithParam("number", idea.ID).
+ Execute(handlers.RemoveSupporter())
+
+ idea, _ = services.Ideas.GetByNumber(idea.Number)
Expect(code).To(Equal(200))
- Expect(idea.TotalSupporters).To(Equal(2))
+ Expect(idea.TotalSupporters).To(Equal(1))
}
diff --git a/app/handlers/oauth_test.go b/app/handlers/oauth_test.go
index 733cd1676..c3807f97f 100644
--- a/app/handlers/oauth_test.go
+++ b/app/handlers/oauth_test.go
@@ -5,8 +5,6 @@ import (
"net/http"
- "net/url"
-
"github.com/getfider/fider/app/handlers"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/mock"
@@ -17,8 +15,7 @@ import (
func TestLoginHandler(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetServices(getServices())
+ server, _ := mock.NewServer()
code, response := server.Execute(handlers.Login(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
@@ -28,21 +25,22 @@ func TestLoginHandler(t *testing.T) {
func TestCallbackHandler_InvalidState(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetServices(getServices())
- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=abc")
- code, _ := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+ server, _ := mock.NewServer()
- Expect(code).To(Equal(http.StatusInternalServerError))
+ Expect(func() {
+ server.
+ WithURL("http://login.test.canherayou.com/oauth/callback?state=abc").
+ Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+ }).To(Panic())
}
func TestCallbackHandler_InvalidCode(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetServices(getServices())
- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io")
- code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+ server, _ := mock.NewServer()
+ code, response := server.
+ WithURL("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io").
+ Execute(handlers.OAuthCallback(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io"))
@@ -50,21 +48,11 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {
func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
RegisterTestingT(t)
- services := getServices()
-
- services.Users.Register(&models.User{
- Name: "Jon Snow",
- Email: "[email protected]",
- Tenant: demoTenant,
- Providers: []*models.UserProvider{
- {UID: "FB1234", Name: oauth.FacebookProvider},
- },
- })
- server := mock.NewServer()
- server.Context.SetServices(services)
- 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(handlers.OAuthCallback(oauth.FacebookProvider))
+ server, _ := mock.NewServer()
+ code, response := server.
+ WithURL("http://demo.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=123").
+ Execute(handlers.OAuthCallback(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJKb24gU25vdyIsInVzZXIvZW1haWwiOiJqb24uc25vd0Bnb3QuY29tIn0.S7P8zTU0rVovmchNbwamBewYbO96GdJcOygn7tbsikw"))
@@ -72,70 +60,60 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {
func TestCallbackHandler_NewUser(t *testing.T) {
RegisterTestingT(t)
- services := getServices()
- server := mock.NewServer()
- server.Context.SetServices(services)
- 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(handlers.OAuthCallback(oauth.FacebookProvider))
+ server, services := mock.NewServer()
+ code, response := server.
+ WithURL("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io&code=456").
+ Execute(handlers.OAuthCallback(oauth.FacebookProvider))
- user, err := services.Users.GetByEmail(orangeTenant.ID, "[email protected]")
+ user, err := services.Users.GetByEmail(mock.OrangeTenant.ID, "[email protected]")
Expect(err).To(BeNil())
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?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.QklasoVtsMu_urLZsJv0CDu0VuMFI2CNC78ckx0nSfQ"))
+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.ydyGDIZZHbJ-mgvpAsXTZnbs1rBH6cTVjHctZEACUOo"))
}
func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {
RegisterTestingT(t)
- services := getServices()
+
+ server, services := mock.NewServer()
services.Users.Register(&models.User{
Name: "Some Guy",
Email: "",
- Tenant: demoTenant,
+ Tenant: mock.DemoTenant,
Providers: []*models.UserProvider{
&models.UserProvider{UID: "GO999", Name: oauth.GoogleProvider},
},
})
- server := mock.NewServer()
- server.Context.SetServices(services)
- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=798")
- code, response := server.Execute(handlers.OAuthCallback(oauth.FacebookProvider))
+ code, response := server.
+ WithURL("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=798").
+ Execute(handlers.OAuthCallback(oauth.FacebookProvider))
- user, err := services.Users.GetByID(1)
+ user, err := services.Users.GetByID(3)
Expect(err).To(BeNil())
Expect(user.Name).To(Equal("Some Guy"))
Expect(len(user.Providers)).To(Equal(1))
- user, err = services.Users.GetByID(2)
+ user, err = services.Users.GetByID(4)
Expect(err).To(BeNil())
Expect(user.Name).To(Equal("Mark"))
Expect(len(user.Providers)).To(Equal(1))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoyLCJ1c2VyL25hbWUiOiJNYXJrIiwidXNlci9lbWFpbCI6IiJ9.NKMh8HaRud9wOtFznIWZuJabsYFm8UWy3jPykJ7U79E"))
+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjo0LCJ1c2VyL25hbWUiOiJNYXJrIiwidXNlci9lbWFpbCI6IiJ9.G93ZTFcDuHiIlYbDvMnjhoDebeJZMifWbv9v0rayQOI"))
}
func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {
RegisterTestingT(t)
- services := getServices()
- services.Users.Register(&models.User{
- Name: "Jon Snow",
- Email: "[email protected]",
- Tenant: demoTenant,
- Providers: []*models.UserProvider{
- &models.UserProvider{UID: "FB123", Name: oauth.FacebookProvider},
- },
- })
- server := mock.NewServer()
- server.Context.SetServices(services)
- 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(handlers.OAuthCallback(oauth.GoogleProvider))
+ server, services := mock.NewServer()
+ code, response := server.
+ WithURL("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io&code=123").
+ Execute(handlers.OAuthCallback(oauth.GoogleProvider))
- user, err := services.Users.GetByEmail(demoTenant.ID, "[email protected]")
+ user, err := services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")
Expect(err).To(BeNil())
Expect(len(user.Providers)).To(Equal(2))
diff --git a/app/handlers/signup.go b/app/handlers/signup.go
index 58c2d2fb1..71f99fea3 100644
--- a/app/handlers/signup.go
+++ b/app/handlers/signup.go
@@ -6,8 +6,8 @@ import (
"strings"
"github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/actions"
"github.com/getfider/fider/app/models"
- "github.com/getfider/fider/app/models/im"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/validate"
"github.com/getfider/fider/app/pkg/web"
@@ -31,23 +31,23 @@ func CheckAvailability() web.HandlerFunc {
//CreateTenant creates a new tenant
func CreateTenant() web.HandlerFunc {
return func(c web.Context) error {
- input := new(im.CreateTenant)
+ input := new(actions.CreateTenant)
if result := c.BindTo(input); !result.Ok {
return c.HandleValidation(result)
}
- tenant, err := c.Services().Tenants.Add(input.Name, input.Subdomain)
+ tenant, err := c.Services().Tenants.Add(input.Model.Name, input.Model.Subdomain)
if err != nil {
return c.Failure(err)
}
user := &models.User{
- Name: input.UserClaims.OAuthName,
- Email: input.UserClaims.OAuthEmail,
+ Name: input.Model.UserClaims.OAuthName,
+ Email: input.Model.UserClaims.OAuthEmail,
Tenant: tenant,
Role: models.RoleAdministrator,
Providers: []*models.UserProvider{
- {UID: input.UserClaims.OAuthID, Name: input.UserClaims.OAuthProvider},
+ {UID: input.Model.UserClaims.OAuthID, Name: input.Model.UserClaims.OAuthProvider},
},
}
diff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.go
index be95b8dde..8470d36ed 100644
--- a/app/handlers/signup_test.go
+++ b/app/handlers/signup_test.go
@@ -5,20 +5,17 @@ import (
"fmt"
- "github.com/getfider/fider/app"
"github.com/getfider/fider/app/handlers"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/mock"
- "github.com/getfider/fider/app/pkg/web"
- "github.com/getfider/fider/app/storage/inmemory"
. "github.com/onsi/gomega"
)
func TestSignUpHandler_MultiTenant(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
+ server, _ := mock.NewServer()
code, _ := server.Execute(handlers.SignUp())
Expect(code).To(Equal(200))
@@ -27,11 +24,7 @@ func TestSignUpHandler_MultiTenant(t *testing.T) {
func TestSignUpHandler_SingleTenant_NoTenants(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewSingleTenantServer()
- tenants := &inmemory.TenantStorage{}
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
+ server, _ := mock.NewSingleTenantServer()
code, _ := server.Execute(handlers.SignUp())
Expect(code).To(Equal(200))
@@ -40,12 +33,8 @@ func TestSignUpHandler_SingleTenant_NoTenants(t *testing.T) {
func TestSignUpHandler_SingleTenant_WithTenants(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewSingleTenantServer()
- tenants := &inmemory.TenantStorage{}
- tenants.Add("Game of Thrones", "got")
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
+ server, services := mock.NewSingleTenantServer()
+ services.Tenants.Add("Game of Thrones", "got")
code, _ := server.Execute(handlers.SignUp())
Expect(code).To(Equal(307))
@@ -54,13 +43,8 @@ func TestSignUpHandler_SingleTenant_WithTenants(t *testing.T) {
func TestCheckAvailabilityHandler_InvalidSubdomain(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- tenants := &inmemory.TenantStorage{}
- tenants.Add("Game of Thrones", "got")
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
- code, response := server.ExecuteAsJSON(handlers.CheckAvailability())
+ server, _ := mock.NewServer()
+ code, response := server.WithParam("subdomain", "").ExecuteAsJSON(handlers.CheckAvailability())
Expect(code).To(Equal(200))
Expect(response.String("message")).NotTo(BeNil())
@@ -69,14 +53,8 @@ func TestCheckAvailabilityHandler_InvalidSubdomain(t *testing.T) {
func TestCheckAvailabilityHandler_UnavailableSubdomain(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetParams(web.Map{"subdomain": "got"})
- tenants := &inmemory.TenantStorage{}
- tenants.Add("Game of Thrones", "got")
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
- code, response := server.ExecuteAsJSON(handlers.CheckAvailability())
+ server, _ := mock.NewServer()
+ code, response := server.WithParam("subdomain", "demo").ExecuteAsJSON(handlers.CheckAvailability())
Expect(code).To(Equal(200))
Expect(response.String("message")).NotTo(BeNil())
@@ -85,14 +63,8 @@ func TestCheckAvailabilityHandler_UnavailableSubdomain(t *testing.T) {
func TestCheckAvailabilityHandler_ValidSubdomain(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetParams(web.Map{"subdomain": "mycompany"})
- tenants := &inmemory.TenantStorage{}
- tenants.Add("Game of Thrones", "got")
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
- code, response := server.ExecuteAsJSON(handlers.CheckAvailability())
+ server, _ := mock.NewServer()
+ code, response := server.WithParam("subdomain", "mycompany").ExecuteAsJSON(handlers.CheckAvailability())
Expect(code).To(Equal(200))
_, err := response.String("message")
@@ -102,10 +74,7 @@ func TestCheckAvailabilityHandler_ValidSubdomain(t *testing.T) {
func TestCreateTenantHandler_EmptyInput(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{
- Tenants: &inmemory.TenantStorage{},
- })
+ server, _ := mock.NewServer()
code, _ := server.ExecutePost(handlers.CreateTenant(), `{ }`)
Expect(code).To(Equal(400))
@@ -114,11 +83,7 @@ func TestCreateTenantHandler_EmptyInput(t *testing.T) {
func TestCreateTenantHandler_ValidInput(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{
- Tenants: &inmemory.TenantStorage{},
- Users: &inmemory.UserStorage{},
- })
+ server, _ := mock.NewServer()
token, _ := jwt.Encode(&models.OAuthClaims{
OAuthID: "123",
OAuthName: "Jon Snow",
diff --git a/app/handlers/status_test.go b/app/handlers/status_test.go
index 4e7bcbb22..13494771f 100644
--- a/app/handlers/status_test.go
+++ b/app/handlers/status_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"github.com/getfider/fider/app/handlers"
- "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/mock"
. "github.com/onsi/gomega"
)
@@ -16,7 +16,7 @@ func TestStatusHandler(t *testing.T) {
BuildTime: "today",
}
- server := mock.NewServer()
+ server, _ := mock.NewServer()
status, query := server.ExecuteAsJSON(handlers.Status(settings))
Expect(query.String("build")).To(Equal("today"))
diff --git a/app/middlewares/auth_test.go b/app/middlewares/auth_test.go
index c6b9ba30f..6d0888b0b 100644
--- a/app/middlewares/auth_test.go
+++ b/app/middlewares/auth_test.go
@@ -5,8 +5,8 @@ import (
"testing"
"github.com/getfider/fider/app/middlewares"
- "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/pkg/web"
. "github.com/onsi/gomega"
)
@@ -14,14 +14,9 @@ import (
func TestIsAuthorized_WithAllowedRole(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetUser(&models.User{
- ID: 1,
- Role: models.RoleMember,
- })
-
+ server, _ := mock.NewServer()
server.Use(middlewares.IsAuthorized(models.RoleAdministrator, models.RoleMember))
- status, _ := server.Execute(func(c web.Context) error {
+ status, _ := server.AsUser(mock.JonSnow).Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -31,14 +26,9 @@ func TestIsAuthorized_WithAllowedRole(t *testing.T) {
func TestIsAuthorized_WithForbiddenRole(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetUser(&models.User{
- ID: 1,
- Role: models.RoleVisitor,
- })
-
+ server, _ := mock.NewServer()
server.Use(middlewares.IsAuthorized(models.RoleAdministrator, models.RoleMember))
- status, _ := server.Execute(func(c web.Context) error {
+ status, _ := server.AsUser(mock.AryaStark).Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -48,13 +38,9 @@ func TestIsAuthorized_WithForbiddenRole(t *testing.T) {
func TestIsAuthenticated_WithUser(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.SetUser(&models.User{
- ID: 1,
- })
-
+ server, _ := mock.NewServer()
server.Use(middlewares.IsAuthenticated())
- status, _ := server.Execute(func(c web.Context) error {
+ status, _ := server.AsUser(mock.AryaStark).Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -64,7 +50,7 @@ func TestIsAuthenticated_WithUser(t *testing.T) {
func TestIsAuthenticated_WithoutUser(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
+ server, _ := mock.NewServer()
server.Use(middlewares.IsAuthenticated())
status, _ := server.Execute(func(c web.Context) error {
diff --git a/app/middlewares/cache_test.go b/app/middlewares/cache_test.go
index 3b77a1349..4529ffce6 100644
--- a/app/middlewares/cache_test.go
+++ b/app/middlewares/cache_test.go
@@ -13,7 +13,7 @@ import (
func TestCache(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
+ server, _ := mock.NewServer()
server.Use(middlewares.OneYearCache())
handler := func(c web.Context) error {
return c.NoContent(http.StatusOK)
diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.go
index 3ef9ffdde..e45d3b498 100644
--- a/app/middlewares/domain_test.go
+++ b/app/middlewares/domain_test.go
@@ -4,31 +4,29 @@ import (
"net/http"
"testing"
- "github.com/getfider/fider/app"
"github.com/getfider/fider/app/middlewares"
"github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/pkg/web"
- "github.com/getfider/fider/app/storage/inmemory"
. "github.com/onsi/gomega"
)
var testCases = []struct {
expected string
- hosts []string
+ urls []string
}{
{
"The Orange Inc.",
[]string{
- "orange.test.fider.io",
- "orange.test.fider.io:3000",
+ "http://orange.test.fider.io",
+ "http://orange.test.fider.io:3000",
},
},
{
"Demonstration",
[]string{
- "demo.test.fider.io",
- "demo.test.fider.io:1231",
- "demo.test.fider.io:80",
+ "http://demo.test.fider.io",
+ "http://demo.test.fider.io:1231",
+ "http://demo.test.fider.io:80",
},
},
}
@@ -36,21 +34,13 @@ var testCases = []struct {
func TestMultiTenant(t *testing.T) {
RegisterTestingT(t)
- tenants := &inmemory.TenantStorage{}
- tenants.Add("The Orange Inc.", "orange")
- tenants.Add("Demonstration", "demo")
-
for _, testCase := range testCases {
- for _, host := range testCase.hosts {
-
- server := mock.NewServer()
- server.Context.Request().Host = host
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
+ for _, url := range testCase.urls {
+ server, _ := mock.NewServer()
server.Use(middlewares.MultiTenant())
- status, response := server.Execute(func(c web.Context) error {
+
+ status, response := server.WithURL(url).Execute(func(c web.Context) error {
return c.String(http.StatusOK, c.Tenant().Name)
})
@@ -63,15 +53,10 @@ func TestMultiTenant(t *testing.T) {
func TestMultiTenant_AuthDomain(t *testing.T) {
RegisterTestingT(t)
- tenants := &inmemory.TenantStorage{}
- server := mock.NewServer()
- server.Context.Request().Host = "login.test.fider.io"
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
-
+ server, _ := mock.NewServer()
server.Use(middlewares.MultiTenant())
- status, _ := server.Execute(func(c web.Context) error {
+
+ status, _ := server.WithURL("http://login.test.fider.io").Execute(func(c web.Context) error {
if c.Tenant() == nil {
return c.NoContent(http.StatusOK)
}
@@ -84,15 +69,10 @@ func TestMultiTenant_AuthDomain(t *testing.T) {
func TestMultiTenant_UnknownDomain(t *testing.T) {
RegisterTestingT(t)
- tenants := &inmemory.TenantStorage{}
- server := mock.NewServer()
- server.Context.Request().Host = "somedomain.com"
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
-
+ server, _ := mock.NewServer()
server.Use(middlewares.MultiTenant())
- status, _ := server.Execute(func(c web.Context) error {
+
+ status, _ := server.WithURL("http://somedomain.com").Execute(func(c web.Context) error {
return c.String(http.StatusOK, c.Tenant().Name)
})
@@ -102,15 +82,10 @@ func TestMultiTenant_UnknownDomain(t *testing.T) {
func TestSingleTenant_NoTenants_RedirectToSignUp(t *testing.T) {
RegisterTestingT(t)
- tenants := &inmemory.TenantStorage{}
- server := mock.NewServer()
- server.Context.Request().Host = "somedomain.com"
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
-
+ server, _ := mock.NewSingleTenantServer()
server.Use(middlewares.SingleTenant())
- status, response := server.Execute(func(c web.Context) error {
+
+ status, response := server.WithURL("http://somedomain.com").Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -118,35 +93,28 @@ func TestSingleTenant_NoTenants_RedirectToSignUp(t *testing.T) {
Expect(response.HeaderMap.Get("Location")).To(Equal("/signup"))
}
-func TestSingleTenant_WithTenants_ShouldSetToContext(t *testing.T) {
+func TestSingleTenant_WithTenants_ShouldSetFirstToContext(t *testing.T) {
RegisterTestingT(t)
- tenants := &inmemory.TenantStorage{}
- tenant, _ := tenants.Add("Some Tenant", "mytenant")
-
- server := mock.NewServer()
- server.Context.Request().Host = "somedomain.com"
- server.Context.SetServices(&app.Services{
- Tenants: tenants,
- })
-
+ server, services := mock.NewSingleTenantServer()
server.Use(middlewares.SingleTenant())
- status, _ := server.Execute(func(c web.Context) error {
- return c.NoContent(http.StatusOK)
+ services.Tenants.Add("MyCompany", "mycompany")
+
+ status, response := server.WithURL("http://somedomain.com").Execute(func(c web.Context) error {
+ return c.String(http.StatusOK, c.Tenant().Name)
})
Expect(status).To(Equal(http.StatusOK))
- Expect(server.Context.Tenant()).Should(Equal(tenant))
+ Expect(response.Body.String()).Should(Equal("MyCompany"))
}
func TestHostChecker(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.Request().Host = "login.test.fider.io"
+ server, _ := mock.NewServer()
server.Use(middlewares.HostChecker("login.test.fider.io"))
- status, _ := server.Execute(func(c web.Context) error {
+ status, _ := server.WithURL("http://login.test.fider.io").Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -156,10 +124,9 @@ func TestHostChecker(t *testing.T) {
func TestHostChecker_DifferentHost(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.Request().Host = "orange.test.fider.io"
+ server, _ := mock.NewServer()
server.Use(middlewares.HostChecker("login.test.fider.io"))
- status, _ := server.Execute(func(c web.Context) error {
+ status, _ := server.WithURL("http://orange.test.fider.io").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 9e21d0a03..7eda3a3b2 100644
--- a/app/middlewares/jwt_test.go
+++ b/app/middlewares/jwt_test.go
@@ -4,22 +4,18 @@ import (
"net/http"
"testing"
- "net/url"
-
- "github.com/getfider/fider/app"
"github.com/getfider/fider/app/middlewares"
- "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/jwt"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/pkg/web"
- "github.com/getfider/fider/app/storage/inmemory"
. "github.com/onsi/gomega"
)
func TestJwtGetter_NoCookie(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
+ server, _ := mock.NewServer()
server.Use(middlewares.JwtGetter())
status, _ := server.Execute(func(c web.Context) error {
if c.IsAuthenticated() {
@@ -35,35 +31,20 @@ func TestJwtGetter_NoCookie(t *testing.T) {
func TestJwtGetter_WithCookie(t *testing.T) {
RegisterTestingT(t)
- tenant := &models.Tenant{ID: 300}
- user := &models.User{
- ID: 300,
- Name: "Jon Snow",
- Tenant: tenant,
- }
+ server, _ := mock.NewServer()
token, _ := jwt.Encode(&models.FiderClaims{
- UserID: user.ID,
- UserName: user.Name,
- })
-
- users := &inmemory.UserStorage{}
- users.Register(user)
-
- server := mock.NewServer()
- server.Context.SetServices(&app.Services{
- Users: users,
- })
- server.Context.SetTenant(tenant)
- server.Context.Request().Header.Add("Accept", "application/json")
- server.Context.Request().AddCookie(&http.Cookie{
- Name: "auth",
- Value: token,
+ UserID: mock.JonSnow.ID,
+ UserName: mock.JonSnow.Name,
})
server.Use(middlewares.JwtGetter())
- status, response := server.Execute(func(c web.Context) error {
- return c.String(http.StatusOK, c.User().Name)
- })
+ status, response := server.
+ OnTenant(mock.DemoTenant).
+ AddHeader("Accept", "application/json").
+ AddCookie("auth", token).
+ Execute(func(c web.Context) error {
+ return c.String(http.StatusOK, c.User().Name)
+ })
Expect(status).To(Equal(http.StatusOK))
Expect(response.Body.String()).To(Equal("Jon Snow"))
@@ -72,37 +53,22 @@ func TestJwtGetter_WithCookie(t *testing.T) {
func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {
RegisterTestingT(t)
- tenant := &models.Tenant{ID: 300}
- user := &models.User{
- ID: 300,
- Name: "Jon Snow",
- Tenant: tenant,
- }
+ server, _ := mock.NewServer()
token, _ := jwt.Encode(&models.FiderClaims{
- UserID: 300,
- UserName: "Jon Snow",
- })
-
- users := &inmemory.UserStorage{}
- users.Register(user)
-
- server := mock.NewServer()
- server.Context.SetTenant(&models.Tenant{ID: 400})
- server.Context.SetServices(&app.Services{
- Users: users,
- })
- server.Context.Request().AddCookie(&http.Cookie{
- Name: "auth",
- Value: token,
+ UserID: mock.JonSnow.ID,
+ UserName: mock.JonSnow.Name,
})
server.Use(middlewares.JwtGetter())
- status, _ := server.Execute(func(c web.Context) error {
- if c.User() == nil {
- return c.NoContent(http.StatusNoContent)
- }
- return c.NoContent(http.StatusOK)
- })
+ status, _ := server.
+ OnTenant(mock.OrangeTenant).
+ AddCookie("auth", token).
+ Execute(func(c web.Context) error {
+ if c.User() == nil {
+ return c.NoContent(http.StatusNoContent)
+ }
+ return c.NoContent(http.StatusOK)
+ })
Expect(status).To(Equal(http.StatusNoContent))
}
@@ -110,12 +76,10 @@ func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {
func TestJwtSetter_WithoutJwt(t *testing.T) {
RegisterTestingT(t)
- server := mock.NewServer()
- server.Context.Request().Host = "orange.test.fider.io"
- server.Context.Request().RequestURI = "/abc"
+ server, _ := mock.NewServer()
server.Use(middlewares.JwtSetter())
- status, _ := server.Execute(func(c web.Context) error {
+ status, _ := server.WithURL("http://orange.test.fider.io/abc").Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -125,16 +89,13 @@ func TestJwtSetter_WithoutJwt(t *testing.T) {
func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {
RegisterTestingT(t)
+ server, _ := mock.NewServer()
token, _ := jwt.Encode(&models.FiderClaims{
- UserName: "Jon Snow",
+ UserName: mock.JonSnow.Name,
})
- server := mock.NewServer()
- server.Context.Request().Host = "orange.test.fider.io"
- server.Context.Request().URL, _ = url.Parse("/abc?jwt=" + token)
-
server.Use(middlewares.JwtSetter())
- status, response := server.Execute(func(c web.Context) error {
+ status, response := server.WithURL("http://orange.test.fider.io/abc?jwt=" + token).Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -145,16 +106,13 @@ func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {
func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {
RegisterTestingT(t)
+ server, _ := mock.NewServer()
token, _ := jwt.Encode(&models.FiderClaims{
- UserName: "Jon Snow",
+ UserName: mock.JonSnow.Name,
})
- server := mock.NewServer()
- server.Context.Request().Host = "orange.test.fider.io"
- server.Context.Request().URL, _ = url.Parse("/abc?jwt=" + token + "&foo=bar")
-
server.Use(middlewares.JwtSetter())
- status, response := server.Execute(func(c web.Context) error {
+ status, response := server.WithURL("http://orange.test.fider.io/abc?jwt=" + token + "&foo=bar").Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.go
index 71d78af59..c0a2fdd19 100644
--- a/app/middlewares/setup.go
+++ b/app/middlewares/setup.go
@@ -2,6 +2,7 @@ package middlewares
import (
"fmt"
+ "runtime/debug"
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/pkg/dbx"
@@ -30,13 +31,7 @@ func Setup(db *dbx.Database) web.MiddlewareFunc {
defer func() {
if r := recover(); r != nil {
- var err error
- switch r := r.(type) {
- case error:
- err = r
- default:
- err = fmt.Errorf("%v", r)
- }
+ err := fmt.Errorf("%v\n%v", r, string(debug.Stack()))
if trx != nil {
trx.Rollback()
diff --git a/app/models/feedback.go b/app/models/feedback.go
index 3490cf373..89ea718a4 100644
--- a/app/models/feedback.go
+++ b/app/models/feedback.go
@@ -24,6 +24,23 @@ func (i *Idea) CanBeChangedBy(user *User) bool {
return user.IsStaff() || i.User.ID == user.ID
}
+// NewIdea represents a new idea
+type NewIdea struct {
+ Title string `json:"title"`
+ Description string `json:"description"`
+}
+
+// NewComment represents a new comment
+type NewComment struct {
+ Content string `json:"content"`
+}
+
+// SetResponse represents the action to update an idea response
+type SetResponse struct {
+ Status int `json:"status"`
+ Text string `json:"text"`
+}
+
//IdeaResponse is a staff response to a given idea
type IdeaResponse struct {
Text string `json:"text"`
diff --git a/app/models/identity.go b/app/models/identity.go
index 7dbbbb315..75db76197 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -1,6 +1,8 @@
package models
-import jwt "github.com/dgrijalva/jwt-go"
+import (
+ jwt "github.com/dgrijalva/jwt-go"
+)
//Tenant represents a tenant
type Tenant struct {
@@ -69,3 +71,19 @@ type OAuthClaims struct {
OAuthEmail string `json:"oauth/email"`
jwt.StandardClaims
}
+
+//CreateTenant is the input model used to create a tenant
+type CreateTenant struct {
+ Token string `json:"token"`
+ Name string `json:"name"`
+ Subdomain string `json:"subdomain"`
+ UserClaims *OAuthClaims
+}
+
+//UpdateTenantSettings is the input model used to update tenant settings
+type UpdateTenantSettings struct {
+ Title string `json:"title"`
+ Invitation string `json:"invitation"`
+ WelcomeMessage string `json:"welcomeMessage"`
+ UserClaims *OAuthClaims
+}
diff --git a/app/models/im/idea.go b/app/models/im/idea.go
deleted file mode 100644
index 44d9bcc4f..000000000
--- a/app/models/im/idea.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package im
-
-import (
- "strings"
-
- "github.com/getfider/fider/app"
- "github.com/getfider/fider/app/models"
- "github.com/getfider/fider/app/pkg/validate"
-)
-
-// Idea represents an unsaved idea
-type Idea struct {
- Title string `json:"title"`
- Description string `json:"description"`
-}
-
-// IsAuthorized returns true if current user is authorized to perform this action
-func (input *Idea) IsAuthorized(user *models.User) bool {
- return true
-}
-
-// Validate is current model is valid
-func (input *Idea) Validate(services *app.Services) *validate.Result {
- result := validate.Success()
-
- input.Title = strings.Trim(input.Title, " ")
-
- if input.Title == "" {
- result.AddFieldFailure("title", "Title is required.")
- }
-
- if len(input.Title) < 10 || len(strings.Split(input.Title, " ")) < 3 {
- result.AddFieldFailure("title", "Title needs to be more descriptive.")
- }
-
- return result
-}
-
-// NewComment represents a new comment
-type NewComment struct {
- Content string `json:"content"`
-}
-
-// IsAuthorized returns true if current user is authorized to perform this action
-func (c *NewComment) IsAuthorized(user *models.User) bool {
- return true
-}
-
-// Validate is current model is valid
-func (c *NewComment) Validate(services *app.Services) *validate.Result {
- result := validate.Success()
-
- if strings.Trim(c.Content, " ") == "" {
- result.AddFieldFailure("content", "Comment is required.")
- }
-
- return result
-}
-
-// SetResponse represents the action to update an idea response
-type SetResponse struct {
- Status int `json:"status"`
- Text string `json:"text"`
-}
-
-// IsAuthorized returns true if current user is authorized to perform this action
-func (input *SetResponse) IsAuthorized(user *models.User) bool {
- return true
-}
-
-// Validate is current model is valid
-func (input *SetResponse) Validate(services *app.Services) *validate.Result {
- result := validate.Success()
-
- if input.Status < models.IdeaNew || input.Status > models.IdeaDeclined {
- result.AddFieldFailure("status", "Status is invalid.")
- }
-
- if strings.Trim(input.Text, " ") == "" {
- result.AddFieldFailure("text", "Text is required.")
- }
-
- return result
-}
diff --git a/app/models/im/tenant_test.go b/app/models/im/tenant_test.go
deleted file mode 100644
index fc178488c..000000000
--- a/app/models/im/tenant_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package im_test
-
-import (
- "testing"
-
- "github.com/getfider/fider/app/models/im"
- . "github.com/onsi/gomega"
-)
-
-func TestCreateTenant_EmptyToken(t *testing.T) {
- RegisterTestingT(t)
-
- input := im.CreateTenant{Token: ""}
- result := input.Validate(services)
- ExpectFailed(result, "token")
-}
-
-func TestCreateTenant_EmptyName(t *testing.T) {
- RegisterTestingT(t)
-
- input := im.CreateTenant{Token: jonSnowToken, Name: ""}
- result := input.Validate(services)
- ExpectFailed(result, "name")
-}
-
-func TestCreateTenant_EmptySubdomain(t *testing.T) {
- RegisterTestingT(t)
-
- input := im.CreateTenant{Token: jonSnowToken, Name: "My Company"}
- result := input.Validate(services)
- ExpectFailed(result, "subdomain")
-}
-
-func TestCreateTenant_UpperCaseSubdomain(t *testing.T) {
- RegisterTestingT(t)
-
- input := im.CreateTenant{Token: jonSnowToken, Name: "My Company", Subdomain: "MyCompany"}
- result := input.Validate(services)
- ExpectSuccess(result)
- Expect(input.Subdomain).To(Equal("mycompany"))
-}
-
-func TestUpdateTenantSettings_EmptyTitle(t *testing.T) {
- RegisterTestingT(t)
-
- input := im.UpdateTenantSettings{}
- result := input.Validate(services)
- ExpectFailed(result, "title")
-}
-
-func TestUpdateTenantSettings_LargeTitle(t *testing.T) {
- RegisterTestingT(t)
-
- input := im.UpdateTenantSettings{Title: "123456789012345678901234567890123456789012345678901234567890123"}
- result := input.Validate(services)
- ExpectFailed(result, "title")
-}
-
-func TestUpdateTenantSettings_LargeInvitation(t *testing.T) {
- RegisterTestingT(t)
-
- input := im.UpdateTenantSettings{Title: "Ok", Invitation: "123456789012345678901234567890123456789012345678901234567890123"}
- result := input.Validate(services)
- ExpectFailed(result, "invitation")
-}
diff --git a/app/pkg/mock/oauth.go b/app/pkg/mock/oauth.go
new file mode 100644
index 000000000..89041a6d7
--- /dev/null
+++ b/app/pkg/mock/oauth.go
@@ -0,0 +1,56 @@
+package mock
+
+import "github.com/getfider/fider/app/pkg/oauth"
+
+//OAuthService implements a mocked OAuthService
+type OAuthService struct{}
+
+//GetAuthURL returns authentication url for given provider
+func (p *OAuthService) GetAuthURL(authEndpoint string, provider string, redirect string) string {
+ return "http://orange.test.canherayou.com/oauth/token?provider=" + provider + "&redirect=" + redirect
+}
+
+//GetProfile returns user profile based on provider and code
+func (p *OAuthService) GetProfile(authEndpoint string, provider string, code string) (*oauth.UserProfile, error) {
+ if provider == "facebook" && code == "123" {
+ return &oauth.UserProfile{
+ ID: "FB123",
+ Name: "Jon Snow",
+ Email: "[email protected]",
+ }, nil
+ }
+
+ if provider == "facebook" && code == "456" {
+ return &oauth.UserProfile{
+ ID: "FB456",
+ Name: "Some Facebook Guy",
+ Email: "[email protected]",
+ }, nil
+ }
+
+ if provider == "facebook" && code == "798" {
+ return &oauth.UserProfile{
+ ID: "FB798",
+ Name: "Mark",
+ Email: "",
+ }, nil
+ }
+
+ if provider == "google" && code == "123" {
+ return &oauth.UserProfile{
+ ID: "GO123",
+ Name: "Jon Snow",
+ Email: "[email protected]",
+ }, nil
+ }
+
+ if provider == "google" && code == "456" {
+ return &oauth.UserProfile{
+ ID: "GO456",
+ Name: "Bob",
+ Email: "",
+ }, nil
+ }
+
+ return nil, nil
+}
diff --git a/app/pkg/mock/server.go b/app/pkg/mock/server.go
index 40e7690f0..7289b0450 100644
--- a/app/pkg/mock/server.go
+++ b/app/pkg/mock/server.go
@@ -4,9 +4,10 @@ import (
"encoding/json"
"net/http"
"net/http/httptest"
- "os"
+ "net/url"
"strings"
+ "github.com/getfider/fider/app"
"github.com/getfider/fider/app/middlewares"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/web"
@@ -16,32 +17,24 @@ import (
// Server is a HTTP server wrapper for testing purpose
type Server struct {
engine *web.Engine
- Context web.Context
+ context web.Context
recorder *httptest.ResponseRecorder
middleware web.MiddlewareFunc
}
-// NewSingleTenantServer creates a new multitenant test server
-func NewSingleTenantServer() *Server {
- server := NewServer()
- os.Setenv("HOST_MODE", "single")
- return server
-}
-
-// NewServer creates a new test server
-func NewServer() *Server {
- os.Setenv("HOST_MODE", "multi")
+func createServer(services *app.Services) *Server {
settings := &models.AppSettings{}
engine := web.New(settings)
request, _ := http.NewRequest("GET", "/", nil)
recorder := httptest.NewRecorder()
context := engine.NewContext(request, recorder)
+ context.SetServices(services)
return &Server{
engine: engine,
recorder: recorder,
- Context: web.Context{Context: context},
+ context: context,
middleware: middlewares.Noop(),
}
}
@@ -51,10 +44,54 @@ func (s *Server) Use(middleware web.MiddlewareFunc) {
s.middleware = middleware
}
+// OnTenant set current context tenant
+func (s *Server) OnTenant(tenant *models.Tenant) *Server {
+ s.context.SetTenant(tenant)
+ return s
+}
+
+// AsUser set current context user
+func (s *Server) AsUser(user *models.User) *Server {
+ s.context.SetUser(user)
+ return s
+}
+
+// WithParam set current context params
+func (s *Server) WithParam(name string, value interface{}) *Server {
+ s.context.SetParams(web.Map{name: value})
+ return s
+}
+
+// AddHeader add key-value to current context headers
+func (s *Server) AddHeader(name string, value string) *Server {
+ s.context.Request().Header.Add(name, value)
+ return s
+}
+
+// AddCookie add key-value to current context cookies
+func (s *Server) AddCookie(name string, value string) *Server {
+ s.context.Request().AddCookie(&http.Cookie{Name: name, Value: value})
+ return s
+}
+
+// WithParams set current context params
+func (s *Server) WithParams(params web.Map) *Server {
+ s.context.SetParams(params)
+ return s
+}
+
+// WithURL set current context Request URL
+func (s *Server) WithURL(fullURL string) *Server {
+ s.context.Request().URL, _ = url.Parse(fullURL)
+ s.context.Request().Host = s.context.Request().URL.Host
+ return s
+}
+
// Execute given handler and return response
func (s *Server) Execute(handler web.HandlerFunc) (int, *httptest.ResponseRecorder) {
- if err := s.middleware(handler)(s.Context); err != nil {
- s.engine.HandleError(err, s.Context)
+
+ if err := s.middleware(handler)(s.context); err != nil {
+ s.engine.HandleError(err, s.context)
}
return s.recorder.Code, s.recorder
@@ -62,8 +99,9 @@ func (s *Server) Execute(handler web.HandlerFunc) (int, *httptest.ResponseRecord
// ExecuteAsJSON given handler and return json response
func (s *Server) ExecuteAsJSON(handler web.HandlerFunc) (int, *jsonq.JsonQuery) {
- if err := s.middleware(handler)(s.Context); err != nil {
- s.engine.HandleError(err, s.Context)
+
+ if err := s.middleware(handler)(s.context); err != nil {
+ s.engine.HandleError(err, s.context)
}
return parseJSONBody(s)
@@ -71,15 +109,17 @@ func (s *Server) ExecuteAsJSON(handler web.HandlerFunc) (int, *jsonq.JsonQuery)
// ExecutePost executes given handler as POST and return response
func (s *Server) ExecutePost(handler web.HandlerFunc, body string) (int, *httptest.ResponseRecorder) {
+
req, _ := http.NewRequest("POST", "/", strings.NewReader(body))
req.Header.Add("Content-Type", "application/json; charset=UTF-8")
- s.Context.SetRequest(req)
+ s.context.SetRequest(req)
- if err := s.middleware(handler)(s.Context); err != nil {
- s.engine.HandleError(err, s.Context)
+ if err := s.middleware(handler)(s.context); err != nil {
+ s.engine.HandleError(err, s.context)
}
return s.recorder.Code, s.recorder
+
}
func parseJSONBody(s *Server) (int, *jsonq.JsonQuery) {
diff --git a/app/pkg/mock/setup.go b/app/pkg/mock/setup.go
new file mode 100644
index 000000000..77e1625b8
--- /dev/null
+++ b/app/pkg/mock/setup.go
@@ -0,0 +1,68 @@
+package mock
+
+import (
+ "os"
+
+ "github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/oauth"
+ "github.com/getfider/fider/app/storage/inmemory"
+)
+
+// DemoTenant is a mocked tenant
+var DemoTenant *models.Tenant
+
+// OrangeTenant is a mocked tenant
+var OrangeTenant *models.Tenant
+
+// JonSnow is a mocked user
+var JonSnow *models.User
+
+// AryaStark is a mocked user
+var AryaStark *models.User
+
+// NewSingleTenantServer creates a new multitenant test server
+func NewSingleTenantServer() (*Server, *app.Services) {
+ services := createServices(false)
+ server := createServer(services)
+ os.Setenv("HOST_MODE", "single")
+ return server, services
+}
+
+// NewServer creates a new server and services for HTTP testing
+func NewServer() (*Server, *app.Services) {
+ services := createServices(true)
+ server := createServer(services)
+ os.Setenv("HOST_MODE", "multi")
+ return server, services
+}
+
+func createServices(seed bool) *app.Services {
+ services := &app.Services{
+ Tenants: &inmemory.TenantStorage{},
+ Users: &inmemory.UserStorage{},
+ Ideas: &inmemory.IdeaStorage{},
+ OAuth: &OAuthService{},
+ }
+
+ if seed {
+ DemoTenant, _ = services.Tenants.Add("Demonstration", "demo")
+ OrangeTenant, _ = services.Tenants.Add("The Orange Inc.", "orange")
+
+ JonSnow = &models.User{
+ Name: "Jon Snow",
+ Email: "[email protected]",
+ Tenant: DemoTenant,
+ Role: models.RoleAdministrator,
+ Providers: []*models.UserProvider{
+ {UID: "FB1234", Name: oauth.FacebookProvider},
+ },
+ }
+ services.Users.Register(JonSnow)
+
+ AryaStark = &models.User{Name: "Arya Stark", Email: "[email protected]", Tenant: DemoTenant, Role: models.RoleVisitor}
+ services.Users.Register(AryaStark)
+ }
+
+ return services
+}
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index e43de811c..557d88a4a 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -8,6 +8,7 @@ import (
"strings"
"github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/actions"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/env"
@@ -43,13 +44,17 @@ func (ctx *Context) Tenant() *models.Tenant {
//SetTenant update HTTP context with current tenant
func (ctx *Context) SetTenant(tenant *models.Tenant) {
- ctx.Logger().Debugf("Current tenant: %v (ID: %v)", tenant.Name, tenant.ID)
+ if tenant != nil {
+ ctx.Logger().Debugf("Current tenant: %v (ID: %v)", tenant.Name, tenant.ID)
+ } else {
+ ctx.Logger().Debug("Current tenant: nil")
+ }
ctx.Set(tenantContextKey, tenant)
}
//BindTo context values into given model
-func (ctx *Context) BindTo(i validate.Validatable) *validate.Result {
- err := ctx.Bind(i)
+func (ctx *Context) BindTo(i actions.Actionable) *validate.Result {
+ err := ctx.Bind(i.NewModel())
if err != nil {
return validate.Error(err)
}
@@ -76,7 +81,7 @@ func (ctx *Context) NotFound() error {
//Failure returns a 500 page
func (ctx *Context) Failure(err error) error {
- return echo.NewHTTPError(http.StatusInternalServerError, err)
+ panic(err)
}
//HandleValidation handles given validation result property to return 400 or 500
@@ -117,6 +122,10 @@ func (ctx *Context) Page(dict Map) error {
//SetParams sets path parameter names and values.
func (ctx *Context) SetParams(dict Map) {
+ if dict == nil {
+ return
+ }
+
names := make([]string, len(dict))
values := make([]string, len(dict))
@@ -139,7 +148,11 @@ func (ctx *Context) User() *models.User {
//SetUser update HTTP context with current user
func (ctx *Context) SetUser(user *models.User) {
- ctx.Logger().Debugf("Logged as: %v [%v] (ID: %v)", user.Name, user.Email, user.ID)
+ if user != nil {
+ ctx.Logger().Debugf("Logged as: %v [%v] (ID: %v)", user.Name, user.Email, user.ID)
+ } else {
+ ctx.Logger().Debug("Logged as: nil")
+ }
ctx.Set(userContextKey, user)
}
diff --git a/public/components/common/MultiLineText.tsx b/public/components/common/MultiLineText.tsx
index 82c2d034c..0a42a482c 100644
--- a/public/components/common/MultiLineText.tsx
+++ b/public/components/common/MultiLineText.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
import * as md from 'markdown-it';
const cm = md('commonmark', { html: false, linkify: true }).enable('linkify');
-const linkify = md('zero', { linkify: true }).enable('linkify');
interface MultiLineText {
className?: string;
@@ -20,6 +19,6 @@ export const MultiLineText = (props: MultiLineText) => {
}
return <div className={props.className}>{props.text.split('\n').map((item, i) =>
- <span dangerouslySetInnerHTML={{__html: linkify.renderInline(item) + '<br />'}}></span>
+ <span dangerouslySetInnerHTML={{__html: cm.renderInline(item) + '<br />'}}></span>
)}</div>;
};
diff --git a/public/pages/home/SiteHomePage.scss b/public/pages/home/SiteHomePage.scss
index c507633f2..9ede2b4a0 100644
--- a/public/pages/home/SiteHomePage.scss
+++ b/public/pages/home/SiteHomePage.scss
@@ -33,21 +33,21 @@
}
#new-idea-input::-webkit-input-placeholder { /* WebKit, Blink, Edge */
- color: $main-color;
+ color: lighten($main-color, 25);
}
#new-idea-input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
- color: $main-color;
+ color: lighten($main-color, 25);
opacity: 1;
}
#new-idea-input::-moz-placeholder { /* Mozilla Firefox 19+ */
- color: $main-color;
+ color: lighten($main-color, 25);
opacity: 1;
}
#new-idea-input:-ms-input-placeholder { /* Internet Explorer 10-11 */
- color: $main-color;
+ color: lighten($main-color, 25);
}
#new-idea-input::-ms-input-placeholder { /* Microsoft Edge */
- color: $main-color;
+ color: lighten($main-color, 25);
}
.idea-title {