Skip to content

Commit 9ce82de

Browse files
defelmnqdefelmnq
committed
wokr on golden files
1 parent 359884a commit 9ce82de

23 files changed

+71
-151
lines changed

‎coderd/notifications/dispatch/smtp/html.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{{ .Labels._subject }}
1515
</h1>
1616
<div style="line-height: 1.5;">
17-
Hi {{ .UserUsername }},
17+
Hi,
1818
{{ .Labels._body }}
1919
</div>
2020
<div style="text-align: center; margin-top: 32px;">

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateTemplateDeleted.html.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ argin: 8px 0 32px; line-height: 1.5;">
4545
Template "Bobby's Template" deleted
4646
</h1>
4747
<div style=3D"line-height: 1.5;">
48+
Hi,
4849
<p>Hi Bobby,</p>
4950

5051
<p>The template <strong>Bobby&rsquo;s Template</strong> was deleted by <str=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateTemplateDeprecated.html.golden

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hello Bobby,
14-
1513
The template alpha has been deprecated with the following message:
1614

1715
This template has been replaced by beta
@@ -53,10 +51,9 @@ argin: 8px 0 32px; line-height: 1.5;">
5351
Template 'alpha' has been deprecated
5452
</h1>
5553
<div style=3D"line-height: 1.5;">
56-
<p>Hello Bobby,</p>
57-
58-
<p>The template <strong>alpha</strong> has been deprecated with the followi=
59-
ng message:</p>
54+
Hi,
55+
<p>The template <strong>alpha</strong> has been deprecated with the=
56+
following message:</p>
6057

6158
<p><strong>This template has been replaced by beta</strong></p>
6259

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateTestNotification.html.golden

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
This is a test notification.
1614

1715

@@ -46,9 +44,8 @@ argin: 8px 0 32px; line-height: 1.5;">
4644
A test notification
4745
</h1>
4846
<div style=3D"line-height: 1.5;">
49-
<p>Hi Bobby,</p>
50-
51-
<p>This is a test notification.</p>
47+
Hi,
48+
<p>This is a test notification.</p>
5249
</div>
5350
<div style=3D"text-align: center; margin-top: 32px;">
5451
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountActivated.html.golden

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
User account bobby has been activated.
1614

17-
The account belongs to William Tables and it was activated by rob.
18-
1915

2016
View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
2117

@@ -47,12 +43,8 @@ argin: 8px 0 32px; line-height: 1.5;">
4743
User account "bobby" activated
4844
</h1>
4945
<div style=3D"line-height: 1.5;">
50-
<p>Hi Bobby,</p>
51-
52-
<p>User account <strong>bobby</strong> has been activated.</p>
53-
54-
<p>The account belongs to <strong>William Tables</strong> and it was activa=
55-
ted by <strong>rob</strong>.</p>
46+
Hi,
47+
<p>User account <strong>bobby</strong> has been activated.</p>
5648
</div>
5749
<div style=3D"text-align: center; margin-top: 32px;">
5850
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountCreated.html.golden

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
New user account bobby has been created.
1614

17-
This new user account was created for William Tables by rob.
18-
1915

2016
View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
2117

@@ -47,12 +43,8 @@ argin: 8px 0 32px; line-height: 1.5;">
4743
User account "bobby" created
4844
</h1>
4945
<div style=3D"line-height: 1.5;">
50-
<p>Hi Bobby,</p>
51-
52-
<p>New user account <strong>bobby</strong> has been created.</p>
53-
54-
<p>This new user account was created for <strong>William Tables</strong> by=
55-
<strong>rob</strong>.</p>
46+
Hi,
47+
<p>New user account <strong>bobby</strong> has been created.</p>
5648
</div>
5749
<div style=3D"text-align: center; margin-top: 32px;">
5850
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountDeleted.html.golden

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
User account bobby has been deleted.
1614

17-
The deleted account belonged to William Tables and was deleted by rob.
18-
1915

2016
View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
2117

@@ -47,12 +43,8 @@ argin: 8px 0 32px; line-height: 1.5;">
4743
User account "bobby" deleted
4844
</h1>
4945
<div style=3D"line-height: 1.5;">
50-
<p>Hi Bobby,</p>
51-
52-
<p>User account <strong>bobby</strong> has been deleted.</p>
53-
54-
<p>The deleted account belonged to <strong>William Tables</strong> and was =
55-
deleted by <strong>rob</strong>.</p>
46+
Hi,
47+
<p>User account <strong>bobby</strong> has been deleted.</p>
5648
</div>
5749
<div style=3D"text-align: center; margin-top: 32px;">
5850
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountSuspended.html.golden

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
User account bobby has been suspended.
1614

17-
The account belongs to William Tables and it was suspended by rob.
18-
1915

2016
View suspended accounts: http://test.com/deployment/users?filter=3Dstatus%3=
2117
Asuspended
@@ -48,12 +44,8 @@ argin: 8px 0 32px; line-height: 1.5;">
4844
User account "bobby" suspended
4945
</h1>
5046
<div style=3D"line-height: 1.5;">
51-
<p>Hi Bobby,</p>
52-
53-
<p>User account <strong>bobby</strong> has been suspended.</p>
54-
55-
<p>The account belongs to <strong>William Tables</strong> and it was suspen=
56-
ded by <strong>rob</strong>.</p>
47+
Hi,
48+
<p>User account <strong>bobby</strong> has been suspended.</p>
5749
</div>
5850
<div style=3D"text-align: center; margin-top: 32px;">
5951
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateUserRequestedOneTimePasscode.html.golden

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
13+
A request to reset the password for your Coder account has been made. Your =
14+
one-time passcode is:
1415

15-
Use the link below to reset your password.
16+
fad9020b-6562-4cdb-87f1-0486f1bea415
1617

17-
If you did not make this request, you can ignore this message.
18+
If you did not request to reset your password, you can ignore this message.
1819

1920

2021
Reset password: http://test.com/reset-password/change?otp=3Dfad9020b-6562-4=
@@ -48,11 +49,14 @@ argin: 8px 0 32px; line-height: 1.5;">
4849
Reset your password for Coder
4950
</h1>
5051
<div style=3D"line-height: 1.5;">
51-
<p>Hi Bobby,</p>
52+
Hi,
53+
<p>A request to reset the password for your Coder account has been =
54+
made. Your one-time passcode is:</p>
5255

53-
<p>Use the link below to reset your password.</p>
56+
<p><strong>fad9020b-6562-4cdb-87f1-0486f1bea415</strong></p>
5457

55-
<p>If you did not make this request, you can ignore this message.</p>
58+
<p>If you did not request to reset your password, you can ignore this messa=
59+
ge.</p>
5660
</div>
5761
<div style=3D"text-align: center; margin-top: 32px;">
5862
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutoUpdated.html.golden

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,9 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
Your workspace bobby-workspace has been updated automatically to the latest=
1614
template version (1.0).
1715

18-
Reason for update: template now includes catnip.
19-
2016

2117
View workspace: http://test.com/@bobby/bobby-workspace
2218

@@ -48,12 +44,9 @@ argin: 8px 0 32px; line-height: 1.5;">
4844
Workspace "bobby-workspace" updated automatically
4945
</h1>
5046
<div style=3D"line-height: 1.5;">
51-
<p>Hi Bobby,</p>
52-
53-
<p>Your workspace <strong>bobby-workspace</strong> has been updated automat=
54-
ically to the latest template version (1.0).</p>
55-
56-
<p>Reason for update: <strong>template now includes catnip</strong>.</p>
47+
Hi,
48+
<p>Your workspace <strong>bobby-workspace</strong> has been updated=
49+
automatically to the latest template version (1.0).</p>
5750
</div>
5851
<div style=3D"text-align: center; margin-top: 32px;">
5952
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutobuildFailed.html.golden

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
Automatic build of your workspace bobby-workspace failed.
16-
1714
The specified reason was "autostart".
1815

1916

@@ -47,12 +44,10 @@ argin: 8px 0 32px; line-height: 1.5;">
4744
Workspace "bobby-workspace" autobuild failed
4845
</h1>
4946
<div style=3D"line-height: 1.5;">
50-
<p>Hi Bobby,</p>
51-
52-
<p>Automatic build of your workspace <strong>bobby-workspace</strong> faile=
53-
d.</p>
54-
55-
<p>The specified reason was &ldquo;<strong>autostart</strong>&rdquo;.</p>
47+
Hi,
48+
<p>Automatic build of your workspace <strong>bobby-workspace</stron=
49+
g> failed.<br>
50+
The specified reason was &ldquo;<strong>autostart</strong>&rdquo;.</p>
5651
</div>
5752
<div style=3D"text-align: center; margin-top: 32px;">
5853
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceCreated.html.golden

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hello Bobby,
14-
1513
The workspace bobby-workspace has been created from the template bobby-temp=
1614
late using version alpha.
1715

@@ -46,11 +44,10 @@ argin: 8px 0 32px; line-height: 1.5;">
4644
Workspace 'bobby-workspace' has been created
4745
</h1>
4846
<div style=3D"line-height: 1.5;">
49-
<p>Hello Bobby,</p>
50-
51-
<p>The workspace <strong>bobby-workspace</strong> has been created from the=
52-
template <strong>bobby-template</strong> using version <strong>alpha</stro=
53-
ng>.</p>
47+
Hi,
48+
<p>The workspace <strong>bobby-workspace</strong> has been created =
49+
from the template <strong>bobby-template</strong> using version <strong>alp=
50+
ha</strong>.</p>
5451
</div>
5552
<div style=3D"text-align: center; margin-top: 32px;">
5653
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted.html.golden

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
Your workspace bobby-workspace was deleted.
16-
1714
The specified reason was "autodeleted due to dormancy (autobuild)".
1815

1916

@@ -49,12 +46,10 @@ argin: 8px 0 32px; line-height: 1.5;">
4946
Workspace "bobby-workspace" deleted
5047
</h1>
5148
<div style=3D"line-height: 1.5;">
52-
<p>Hi Bobby,</p>
53-
54-
<p>Your workspace <strong>bobby-workspace</strong> was deleted.</p>
55-
56-
<p>The specified reason was &ldquo;<strong>autodeleted due to dormancy (aut=
57-
obuild)</strong>&rdquo;.</p>
49+
Hi,
50+
<p>Your workspace <strong>bobby-workspace</strong> was deleted.<br>
51+
The specified reason was &ldquo;<strong>autodeleted due to dormancy (autobu=
52+
ild)</strong>&rdquo;.</p>
5853
</div>
5954
<div style=3D"text-align: center; margin-top: 32px;">
6055
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted_CustomAppearance.html.golden

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
Your workspace bobby-workspace was deleted.
16-
1714
The specified reason was "autodeleted due to dormancy (autobuild)".
1815

1916

@@ -49,12 +46,10 @@ argin: 8px 0 32px; line-height: 1.5;">
4946
Workspace "bobby-workspace" deleted
5047
</h1>
5148
<div style=3D"line-height: 1.5;">
52-
<p>Hi Bobby,</p>
53-
54-
<p>Your workspace <strong>bobby-workspace</strong> was deleted.</p>
55-
56-
<p>The specified reason was &ldquo;<strong>autodeleted due to dormancy (aut=
57-
obuild)</strong>&rdquo;.</p>
49+
Hi,
50+
<p>Your workspace <strong>bobby-workspace</strong> was deleted.<br>
51+
The specified reason was &ldquo;<strong>autodeleted due to dormancy (autobu=
52+
ild)</strong>&rdquo;.</p>
5853
</div>
5954
<div style=3D"text-align: center; margin-top: 32px;">
6055
=20

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDormant.html.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ argin: 8px 0 32px; line-height: 1.5;">
5151
Workspace "bobby-workspace" marked as dormant
5252
</h1>
5353
<div style=3D"line-height: 1.5;">
54+
Hi,
5455
<p>Hi Bobby,</p>
5556

5657
<p>Your workspace <strong>bobby-workspace</strong> has been marked as <a hr=

‎coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceManualBuildFailed.html.golden

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ MIME-Version: 1.0
1010
Content-Transfer-Encoding: quoted-printable
1111
Content-Type: text/plain; charset=UTF-8
1212

13-
Hi Bobby,
14-
1513
A manual build of the workspace bobby-workspace using the template bobby-te=
1614
mplate failed (version: bobby-template-version).
17-
1815
The workspace build was initiated by joe.
1916

2017

@@ -48,13 +45,11 @@ argin: 8px 0 32px; line-height: 1.5;">
4845
Workspace "bobby-workspace" manual build failed
4946
</h1>
5047
<div style=3D"line-height: 1.5;">
51-
<p>Hi Bobby,</p>
52-
53-
<p>A manual build of the workspace <strong>bobby-workspace</strong> using t=
54-
he template <strong>bobby-template</strong> failed (version: <strong>bobby-=
55-
template-version</strong>).</p>
56-
57-
<p>The workspace build was initiated by <strong>joe</strong>.</p>
48+
Hi,
49+
<p>A manual build of the workspace <strong>bobby-workspace</strong>=
50+
using the template <strong>bobby-template</strong> failed (version: <stron=
51+
g>bobby-template-version</strong>).<br>
52+
The workspace build was initiated by <strong>joe</strong>.</p>
5853
</div>
5954
<div style=3D"text-align: center; margin-top: 32px;">
6055
=20

0 commit comments

Comments
 (0)