Skip to content

fix: make default support links respect --docs-url #14176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 12, 2024
Merged

fix: make default support links respect --docs-url #14176

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1758fa
it works now yay
bcpeinhardt Aug 5, 2024
e95fb05
add test
bcpeinhardt Aug 5, 2024
af9af96
apparently I had an unstaged file?
bcpeinhardt Aug 5, 2024
f9dfb4e
fix lints
bcpeinhardt Aug 5, 2024
466004d
add version through frontend
bcpeinhardt Aug 6, 2024
c92370b
Merge branch 'main' into bcpeinhardt/respect_docs_url_within_default_…
bcpeinhardt Aug 9, 2024
a756f3a
enrich support links from backend
bcpeinhardt Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add test
  • Loading branch information
@bcpeinhardt
bcpeinhardt committed Aug 5, 2024
commit e95fb052b0bcfeb55137161ace4dc4331c0c41c2
21 changes: 21 additions & 0 deletions enterprise/coderd/appearance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"net/http"
"net/url"
"testing"

"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -229,6 +230,26 @@ func TestCustomSupportLinks(t *testing.T) {
require.Equal(t, supportLinks, appr.SupportLinks)
}

func TestDefaultSupportLinksWithCustomDocsUrl(t *testing.T) {
t.Parallel()

// Don't need to set the license, as default links are passed without it.
testURLRawString := "http://google.com"
testURL, err := url.Parse(testURLRawString)
require.NoError(t, err)
cfg := coderdtest.DeploymentValues(t)
cfg.DocsURL = *serpent.URLOf(testURL)
adminClient, adminUser := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true, Options: &coderdtest.Options{DeploymentValues: cfg}})
anotherClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
defer cancel()

appr, err := anotherClient.Appearance(ctx)
require.NoError(t, err)
require.Equal(t, appearance.DefaultSupportLinks(testURLRawString), appr.SupportLinks)
}

func TestDefaultSupportLinks(t *testing.T) {
t.Parallel()

Expand Down
Loading