Open platform to collect and prioritize feedback
refactoring: unit tests for renderer.go (#639)
Guilherme Oenning98028611a376
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 2c4beb655..2195bb11c 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -40,7 +40,7 @@ type Renderer struct {logger log.Loggersettings *models.SystemSettingsassets *clientAssets- sync.RWMutex+ mutex sync.RWMutex}// NewRenderer creates a new Renderer@@ -49,6 +49,7 @@ func NewRenderer(settings *models.SystemSettings, logger log.Logger) *Renderer {templates: make(map[string]*template.Template),logger: logger,settings: settings,+ mutex: sync.RWMutex{},}}@@ -66,8 +67,8 @@ func (r *Renderer) add(name string) *template.Template {}func (r *Renderer) loadAssets(ctx *Context) error {- r.Lock()- defer r.Unlock()+ r.mutex.Lock()+ defer r.mutex.Unlock()if r.assets != nil && env.IsProduction() {return nil@@ -83,7 +84,13 @@ func (r *Renderer) loadAssets(ctx *Context) error {} `json:"entrypoints"`}- jsonFile, err := os.Open(env.Path("/dist/assets.json"))+ assetsFilePath := "/dist/assets.json"+ if env.IsTest() {+ // Load a fake assets.json for Unit Testing+ assetsFilePath = "/app/pkg/web/testdata/assets.json"+ }++ jsonFile, err := os.Open(env.Path(assetsFilePath))if err != nil {return errors.Wrap(err, "failed to open file: assets.json")}diff --git a/app/pkg/web/renderer_test.go b/app/pkg/web/renderer_test.gonew file mode 100644index 000000000..a4ec0bb79--- /dev/null+++ b/app/pkg/web/renderer_test.go@@ -0,0 +1,83 @@+package web_test++import (+ "bytes"+ "io/ioutil"+ "strings"+ "testing"++ "github.com/getfider/fider/app/models"+ . "github.com/getfider/fider/app/pkg/assert"+ "github.com/getfider/fider/app/pkg/env"+ "github.com/getfider/fider/app/pkg/log/noop"+ "github.com/getfider/fider/app/pkg/web"+)++func compareRendererResponse(buf *bytes.Buffer, fileName string, ctx *web.Context) {+ bytes, err := ioutil.ReadFile(env.Path(fileName))+ Expect(err).IsNil()+ Expect(strings.Replace(buf.String(), ctx.ContextID(), "CONTEXT_ID", -1)).Equals(string(bytes))+}++func TestRenderer_Basic(t *testing.T) {+ RegisterT(t)++ buf := new(bytes.Buffer)+ ctx := newGetContext("https://demo.test.fider.io:3000/", nil)+ renderer := web.NewRenderer(&models.SystemSettings{}, noop.NewLogger())+ renderer.Render(buf, "index.html", web.Props{}, ctx)+ compareRendererResponse(buf, "/app/pkg/web/testdata/basic.html", ctx)+}++func TestRenderer_Tenant(t *testing.T) {+ RegisterT(t)++ buf := new(bytes.Buffer)+ ctx := newGetContext("https://demo.test.fider.io:3000/", nil)+ ctx.SetTenant(&models.Tenant{Name: "Game of Thrones"})+ renderer := web.NewRenderer(&models.SystemSettings{}, noop.NewLogger())+ renderer.Render(buf, "index.html", web.Props{}, ctx)+ compareRendererResponse(buf, "/app/pkg/web/testdata/tenant.html", ctx)+}++func TestRenderer_Props(t *testing.T) {+ RegisterT(t)++ buf := new(bytes.Buffer)+ ctx := newGetContext("https://demo.test.fider.io:3000/", nil)+ renderer := web.NewRenderer(&models.SystemSettings{}, noop.NewLogger())+ renderer.Render(buf, "index.html", web.Props{+ Title: "My Page Title",+ Description: "My Page Description",+ Data: web.Map{+ "number": 2,+ "array": []string{"1", "2"},+ "object": web.Map{+ "key1": "value1",+ "key2": "value2",+ },+ },+ }, ctx)++ compareRendererResponse(buf, "/app/pkg/web/testdata/props.html", ctx)+}++func TestRenderer_AuthenticatedUser(t *testing.T) {+ RegisterT(t)++ buf := new(bytes.Buffer)+ ctx := newGetContext("https://demo.test.fider.io:3000/", nil)+ ctx.SetUser(&models.User{+ Name: "Jon Snow",+ Email: "[email protected]",+ Status: models.UserActive,+ Role: models.RoleAdministrator,+ })+ renderer := web.NewRenderer(&models.SystemSettings{}, noop.NewLogger())+ renderer.Render(buf, "index.html", web.Props{+ Title: "My Page Title",+ Description: "My Page Description",+ }, ctx)++ compareRendererResponse(buf, "/app/pkg/web/testdata/user.html", ctx)+}diff --git a/app/pkg/web/testdata/assets.json b/app/pkg/web/testdata/assets.jsonnew file mode 100644index 000000000..365496e2f--- /dev/null+++ b/app/pkg/web/testdata/assets.json@@ -0,0 +1,15 @@+{+ "entrypoints": {+ "main": {+ "assets": [+ "css/file1.css",+ "css/file1.css.map",+ "js/file1.js",+ "js/file1.js.map",+ "images/logo.jpg",+ "js/file2.js",+ "js/file2.js.map"+ ]+ }+ }+}\ No newline at end of filediff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.htmlnew file mode 100755index 000000000..3342362b0--- /dev/null+++ b/app/pkg/web/testdata/basic.html@@ -0,0 +1,51 @@+<!DOCTYPE html>+<html>+<head>+ <meta charset="utf-8"/>+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />+ <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+++ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+++ <title>Fider</title>+ <meta name="description" content="" />+ <meta property="og:title" content="Fider" />+ <meta property="og:description" content="" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://getfider.com/images/logo-100x100.png">++</head>+<body>+ <noscript class="container">+ <div class="c-segment">+ <h2>Please enable JavaScript</h2>+ <p>This website relies on JavaScript-based technologies and services.</p>+ <p>Please enable JavaScript and then reload the page.</p>+ </div>+ </noscript>++++ <div id="root"></div><div id="root-modal"></div>++ <script id="server-data" type="application/json">++ {"__assets":{"CSS":["https://demo.test.fider.io:3000/assets/css/file1.css"],"JS":["https://demo.test.fider.io:3000/assets/js/file1.js","https://demo.test.fider.io:3000/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"Fider"}++ </script>+ <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>++++ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>++ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>++++</body>+</html>diff --git a/app/pkg/web/testdata/props.html b/app/pkg/web/testdata/props.htmlnew file mode 100755index 000000000..102083347--- /dev/null+++ b/app/pkg/web/testdata/props.html@@ -0,0 +1,51 @@+<!DOCTYPE html>+<html>+<head>+ <meta charset="utf-8"/>+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />+ <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+++ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+++ <title>My Page Title · Fider</title>+ <meta name="description" content="My Page Description" />+ <meta property="og:title" content="My Page Title · Fider" />+ <meta property="og:description" content="My Page Description" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://getfider.com/images/logo-100x100.png">++</head>+<body>+ <noscript class="container">+ <div class="c-segment">+ <h2>Please enable JavaScript</h2>+ <p>This website relies on JavaScript-based technologies and services.</p>+ <p>Please enable JavaScript and then reload the page.</p>+ </div>+ </noscript>++++ <div id="root"></div><div id="root-modal"></div>++ <script id="server-data" type="application/json">++ {"__assets":{"CSS":["https://demo.test.fider.io:3000/assets/css/file1.css"],"JS":["https://demo.test.fider.io:3000/assets/js/file1.js","https://demo.test.fider.io:3000/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__description":"My Page Description","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":{"array":["1","2"],"number":2,"object":{"key1":"value1","key2":"value2"}},"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"My Page Title · Fider"}++ </script>+ <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>++++ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>++ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>++++</body>+</html>diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.htmlnew file mode 100755index 000000000..5a6d0d254--- /dev/null+++ b/app/pkg/web/testdata/tenant.html@@ -0,0 +1,53 @@+<!DOCTYPE html>+<html>+<head>+ <meta charset="utf-8"/>+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />+ <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+++ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+++ <title>Game of Thrones</title>+ <meta name="description" content="" />+ <meta property="og:title" content="Game of Thrones" />+ <meta property="og:description" content="" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://getfider.com/images/logo-100x100.png">++++</head>+<body>+ <noscript class="container">+ <div class="c-segment">+ <h2>Please enable JavaScript</h2>+ <p>This website relies on JavaScript-based technologies and services.</p>+ <p>Please enable JavaScript and then reload the page.</p>+ </div>+ </noscript>++++ <div id="root"></div><div id="root-modal"></div>++ <script id="server-data" type="application/json">++ {"__assets":{"CSS":["https://demo.test.fider.io:3000/assets/css/file1.css"],"JS":["https://demo.test.fider.io:3000/assets/js/file1.js","https://demo.test.fider.io:3000/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","cname":"","isPrivate":false,"logoID":0},"__title":"Game of Thrones"}++ </script>+ <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>++++ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>++ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>++++</body>+</html>diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.htmlnew file mode 100755index 000000000..6861cb422--- /dev/null+++ b/app/pkg/web/testdata/user.html@@ -0,0 +1,51 @@+<!DOCTYPE html>+<html>+<head>+ <meta charset="utf-8"/>+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />+ <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+++ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+++ <title>My Page Title · Fider</title>+ <meta name="description" content="My Page Description" />+ <meta property="og:title" content="My Page Title · Fider" />+ <meta property="og:description" content="My Page Description" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://getfider.com/images/logo-100x100.png">++</head>+<body>+ <noscript class="container">+ <div class="c-segment">+ <h2>Please enable JavaScript</h2>+ <p>This website relies on JavaScript-based technologies and services.</p>+ <p>Please enable JavaScript and then reload the page.</p>+ </div>+ </noscript>++++ <div id="root"></div><div id="root-modal"></div>++ <script id="server-data" type="application/json">++ {"__assets":{"CSS":["https://demo.test.fider.io:3000/assets/css/file1.css"],"JS":["https://demo.test.fider.io:3000/assets/js/file1.js","https://demo.test.fider.io:3000/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__description":"My Page Description","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"My Page Title · Fider","__user":{"email":"[email protected]","id":0,"isAdministrator":true,"isCollaborator":true,"name":"Jon Snow","role":"administrator","status":"active"}}++ </script>+ <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>++++ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>++ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>++++</body>+</html>