ironmagma/quintodrome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unexport private function

Browse source
This commit is contained in:
Deluan 2020-10-01 09:56:09 -04:00
parent 03867bd8b2
commit cf8756b14b
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/app/app.go
View file

@ -71,7 +71,7 @@ func (app *Router) routes(path string) http.Handler {
}) })
// Serve UI app assets // Serve UI app assets
r.Handle("/", ServeIndex(app.ds, assets.AssetFile())) r.Handle("/", serveIndex(app.ds, assets.AssetFile()))
r.Handle("/*", http.StripPrefix(path, http.FileServer(assets.AssetFile()))) r.Handle("/*", http.StripPrefix(path, http.FileServer(assets.AssetFile())))
return r return r

2
server/app/serve_index.go
View file

@ -15,7 +15,7 @@ import (
) )
// Injects the config in the `index.html` template // Injects the config in the `index.html` template
func ServeIndex(ds model.DataStore, fs http.FileSystem) http.HandlerFunc { func serveIndex(ds model.DataStore, fs http.FileSystem) http.HandlerFunc {
policy := bluemonday.UGCPolicy() policy := bluemonday.UGCPolicy()
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
c, err := ds.User(r.Context()).CountAll() c, err := ds.User(r.Context()).CountAll()

20
server/app/serve_index_test.go
View file

@ -16,7 +16,7 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
var _ = Describe("ServeIndex", func() { var _ = Describe("serveIndex", func() {
var ds model.DataStore var ds model.DataStore
mockUser := &mockedUserRepo{} mockUser := &mockedUserRepo{}
fs := http.Dir("tests/fixtures") fs := http.Dir("tests/fixtures")
@ -30,7 +30,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
Expect(w.Code).To(Equal(200)) Expect(w.Code).To(Equal(200))
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
@ -42,7 +42,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("firstTime", true)) Expect(config).To(HaveKeyWithValue("firstTime", true))
@ -53,7 +53,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("firstTime", false)) Expect(config).To(HaveKeyWithValue("firstTime", false))
@ -64,7 +64,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("baseURL", "base_url_test")) Expect(config).To(HaveKeyWithValue("baseURL", "base_url_test"))
@ -75,7 +75,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("loginBackgroundURL", "my_background_url")) Expect(config).To(HaveKeyWithValue("loginBackgroundURL", "my_background_url"))
@ -86,7 +86,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("welcomeMessage", "Hello")) Expect(config).To(HaveKeyWithValue("welcomeMessage", "Hello"))
@ -97,7 +97,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("enableTranscodingConfig", true)) Expect(config).To(HaveKeyWithValue("enableTranscodingConfig", true))
@ -108,7 +108,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("gaTrackingId", "UA-12345")) Expect(config).To(HaveKeyWithValue("gaTrackingId", "UA-12345"))
@ -118,7 +118,7 @@ var _ = Describe("ServeIndex", func() {
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("version", consts.Version())) Expect(config).To(HaveKeyWithValue("version", consts.Version()))