Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e846d07cf | ||
|
|
a836bc5f80 |
@@ -21,9 +21,10 @@ regress.
|
|||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
- 2026-09-29: The app page shows the app's branch as a label in its title, next
|
- 2026-09-29: The app page shows the app's branch as a label in its title, next
|
||||||
to the status badge, instead of after the repository under it; the app list
|
to the status badge, instead of after the repository under it (#240).
|
||||||
shows the Branch column right after Name and scrolls sideways on narrow
|
|
||||||
screens instead of cutting columns off (#240).
|
- 2026-09-29: An app's deployments page now lists only its 10 most recent
|
||||||
|
deployments, newest first, instead of 50 (#238).
|
||||||
|
|
||||||
- 2026-09-29: `docker-compose.yml` now sets `UPAAS_PORT` to 8080 as well as
|
- 2026-09-29: `docker-compose.yml` now sets `UPAAS_PORT` to 8080 as well as
|
||||||
`PORT`, since upaas reads `UPAAS_PORT` first and a `UPAAS_PORT` in `.env` made
|
`PORT`, since upaas reads `UPAAS_PORT` first and a `UPAAS_PORT` in `.env` made
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ const (
|
|||||||
// recentDeploymentsLimit is the number of recent deployments to show.
|
// recentDeploymentsLimit is the number of recent deployments to show.
|
||||||
recentDeploymentsLimit = 5
|
recentDeploymentsLimit = 5
|
||||||
// deploymentsHistoryLimit is the number of deployments to show in history.
|
// deploymentsHistoryLimit is the number of deployments to show in history.
|
||||||
deploymentsHistoryLimit = 50
|
deploymentsHistoryLimit = 10
|
||||||
)
|
)
|
||||||
|
|
||||||
// redirectToApp issues a SeeOther redirect to the page for the given
|
// redirectToApp issues a SeeOther redirect to the page for the given
|
||||||
|
|||||||
@@ -12,9 +12,9 @@ import (
|
|||||||
"sneak.berlin/go/upaas/internal/service/app"
|
"sneak.berlin/go/upaas/internal/service/app"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestAppBranchIsShown checks that an app's branch can be read from the app
|
// TestAppPageTitleShowsBranch checks that an app's branch can be read from
|
||||||
// page title and from the app list without opening the edit page.
|
// the app page title, next to the status badge, without opening the edit page.
|
||||||
func TestAppBranchIsShown(t *testing.T) {
|
func TestAppPageTitleShowsBranch(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
testCtx := setupTestHandlers(t)
|
testCtx := setupTestHandlers(t)
|
||||||
@@ -26,51 +26,21 @@ func TestAppBranchIsShown(t *testing.T) {
|
|||||||
})
|
})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
t.Run("in the app page title next to the status badge", func(t *testing.T) {
|
request := httptest.NewRequestWithContext(
|
||||||
t.Parallel()
|
t.Context(), http.MethodGet, "/apps/"+createdApp.ID, nil,
|
||||||
|
)
|
||||||
|
request = addChiURLParams(request, map[string]string{"id": createdApp.ID})
|
||||||
|
recorder := httptest.NewRecorder()
|
||||||
|
|
||||||
request := httptest.NewRequestWithContext(
|
testCtx.handlers.HandleAppDetail().ServeHTTP(recorder, request)
|
||||||
t.Context(), http.MethodGet, "/apps/"+createdApp.ID, nil,
|
|
||||||
)
|
|
||||||
request = addChiURLParams(request, map[string]string{"id": createdApp.ID})
|
|
||||||
recorder := httptest.NewRecorder()
|
|
||||||
|
|
||||||
testCtx.handlers.HandleAppDetail().ServeHTTP(recorder, request)
|
require.Equal(t, http.StatusOK, recorder.Code)
|
||||||
|
|
||||||
require.Equal(t, http.StatusOK, recorder.Code)
|
// The title row runs from the app name heading to the end of its div.
|
||||||
|
_, afterHeading, found := strings.Cut(recorder.Body.String(), "<h1")
|
||||||
|
require.True(t, found, "app page has no heading")
|
||||||
|
|
||||||
// The title row runs from the app name heading to the end of its div.
|
titleRow, _, _ := strings.Cut(afterHeading, "</div>")
|
||||||
_, afterHeading, found := strings.Cut(recorder.Body.String(), "<h1")
|
assert.Contains(t, titleRow, `x-text="statusLabel"`)
|
||||||
require.True(t, found, "app page has no heading")
|
assert.Contains(t, titleRow, ">staging</span>")
|
||||||
|
|
||||||
titleRow, _, _ := strings.Cut(afterHeading, "</div>")
|
|
||||||
assert.Contains(t, titleRow, `x-text="statusLabel"`)
|
|
||||||
assert.Contains(t, titleRow, ">staging</span>")
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("in the app list before the repository", func(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
request := httptest.NewRequestWithContext(
|
|
||||||
t.Context(), http.MethodGet, "/", nil,
|
|
||||||
)
|
|
||||||
recorder := httptest.NewRecorder()
|
|
||||||
|
|
||||||
testCtx.handlers.HandleDashboard().ServeHTTP(recorder, request)
|
|
||||||
|
|
||||||
require.Equal(t, http.StatusOK, recorder.Code)
|
|
||||||
|
|
||||||
_, afterRowStart, found := strings.Cut(
|
|
||||||
recorder.Body.String(), `<tr class="table-row-hover">`,
|
|
||||||
)
|
|
||||||
require.True(t, found, "app list has no row for the app")
|
|
||||||
|
|
||||||
row, _, _ := strings.Cut(afterRowStart, "</tr>")
|
|
||||||
branchAt := strings.Index(row, ">staging</td>")
|
|
||||||
repoAt := strings.Index(row, createdApp.RepoURL)
|
|
||||||
|
|
||||||
require.NotEqual(t, -1, branchAt, "branch missing from the app's row")
|
|
||||||
require.NotEqual(t, -1, repoAt, "repository missing from the app's row")
|
|
||||||
assert.Less(t, branchAt, repoAt, "branch should come before repository")
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
@@ -1148,6 +1149,73 @@ func TestHandleCancelDeployReturns404ForUnknownApp(t *testing.T) {
|
|||||||
assert.Equal(t, http.StatusNotFound, recorder.Code)
|
assert.Equal(t, http.StatusNotFound, recorder.Code)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestHandleAppDeploymentsShowsTenNewest verifies the deployments page
|
||||||
|
// lists only the 10 most recent deployments, newest first.
|
||||||
|
func TestHandleAppDeploymentsShowsTenNewest(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
testCtx := setupTestHandlers(t)
|
||||||
|
createdApp := createTestApp(t, testCtx, "deployments-page-app")
|
||||||
|
|
||||||
|
// Create 12 deployments, each started one minute after the one before.
|
||||||
|
firstStart := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
|
ids := make([]int64, 0, 12)
|
||||||
|
|
||||||
|
for idx := range 12 {
|
||||||
|
deployment := models.NewDeployment(testCtx.database)
|
||||||
|
deployment.AppID = createdApp.ID
|
||||||
|
deployment.Status = models.DeploymentStatusSuccess
|
||||||
|
require.NoError(t, deployment.Save(context.Background()))
|
||||||
|
|
||||||
|
_, err := testCtx.database.Exec(
|
||||||
|
context.Background(),
|
||||||
|
"UPDATE deployments SET started_at = ? WHERE id = ?",
|
||||||
|
firstStart.Add(time.Duration(idx)*time.Minute),
|
||||||
|
deployment.ID,
|
||||||
|
)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
ids = append(ids, deployment.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
request := httptest.NewRequestWithContext(
|
||||||
|
t.Context(),
|
||||||
|
http.MethodGet,
|
||||||
|
"/apps/"+createdApp.ID+"/deployments",
|
||||||
|
nil,
|
||||||
|
)
|
||||||
|
request = addChiURLParams(request, map[string]string{"id": createdApp.ID})
|
||||||
|
recorder := httptest.NewRecorder()
|
||||||
|
|
||||||
|
handler := testCtx.handlers.HandleAppDeployments()
|
||||||
|
handler.ServeHTTP(recorder, request)
|
||||||
|
|
||||||
|
require.Equal(t, http.StatusOK, recorder.Code)
|
||||||
|
|
||||||
|
body := recorder.Body.String()
|
||||||
|
card := func(id int64) string {
|
||||||
|
return `data-deployment-id="` + strconv.FormatInt(id, 10) + `"`
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, 10, strings.Count(body, `data-deployment-id="`))
|
||||||
|
|
||||||
|
// The two oldest are left out.
|
||||||
|
assert.NotContains(t, body, card(ids[0]))
|
||||||
|
assert.NotContains(t, body, card(ids[1]))
|
||||||
|
|
||||||
|
// The ten newest are shown, newest first.
|
||||||
|
previous := -1
|
||||||
|
|
||||||
|
for idx := len(ids) - 1; idx >= 2; idx-- {
|
||||||
|
position := strings.Index(body, card(ids[idx]))
|
||||||
|
require.Greater(t, position, previous,
|
||||||
|
"deployment %d missing or out of order", ids[idx])
|
||||||
|
|
||||||
|
previous = position
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestHandleWebhookReturns404ForUnknownSecret(t *testing.T) {
|
func TestHandleWebhookReturns404ForUnknownSecret(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
@@ -21,13 +21,12 @@
|
|||||||
|
|
||||||
{{if .AppStats}}
|
{{if .AppStats}}
|
||||||
<div class="card overflow-hidden">
|
<div class="card overflow-hidden">
|
||||||
<div class="overflow-x-auto">
|
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead class="table-header">
|
<thead class="table-header">
|
||||||
<tr>
|
<tr>
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>Branch</th>
|
|
||||||
<th>Repository</th>
|
<th>Repository</th>
|
||||||
|
<th>Branch</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Last Deploy</th>
|
<th>Last Deploy</th>
|
||||||
<th>Deploys</th>
|
<th>Deploys</th>
|
||||||
@@ -42,8 +41,8 @@
|
|||||||
{{.App.Name}}
|
{{.App.Name}}
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-gray-500">{{.App.Branch}}</td>
|
|
||||||
<td class="text-gray-500 font-mono text-xs">{{.App.RepoURL}}</td>
|
<td class="text-gray-500 font-mono text-xs">{{.App.RepoURL}}</td>
|
||||||
|
<td class="text-gray-500">{{.App.Branch}}</td>
|
||||||
<td>
|
<td>
|
||||||
{{if eq .App.Status "running"}}
|
{{if eq .App.Status "running"}}
|
||||||
<span class="badge-success">Running</span>
|
<span class="badge-success">Running</span>
|
||||||
@@ -79,7 +78,6 @@
|
|||||||
{{end}}
|
{{end}}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="card">
|
<div class="card">
|
||||||
|
|||||||
Reference in New Issue
Block a user