github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

user test fix, email template render

pull/778/head
Hunter Long 2020-08-06 12:16:55 -07:00
parent 3d74005aa5
commit e49b988a60
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
notifiers/email_rendered.go
View File

File diff suppressed because one or more lines are too long

8
notifiers/generate.go
View File

@ -142,7 +142,7 @@ const emailFailureMJML = `<mjml>
<mj-section padding="0" background-url="https://assets.statping.com/offlinebanner.png" background-color="#a30911"> <mj-section padding="0" background-url="https://assets.statping.com/offlinebanner.png" background-color="#a30911">
<mj-column> <mj-column>
<mj-image width="250px" href="https://www.sphero.com" src="https://assets.statping.com/statpingcom.png" align="center"></mj-image> <mj-image width="250px" href="https://statping.com" src="https://assets.statping.com/statpingcom.png" align="center"></mj-image>
</mj-column> </mj-column>
</mj-section> </mj-section>
@ -166,8 +166,6 @@ const emailFailureMJML = `<mjml>
<a class="footer-link" href="https://github.com/statping/statping">Github</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0; <a class="footer-link" href="https://github.com/statping/statping">Github</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
<a class="footer-link" href="https://statping.com/privacy">Privacy</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0; <a class="footer-link" href="https://statping.com/privacy">Privacy</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
<a class="footer-link" href="https://news.statping.com/delete?email={{.Email}}">Unsubscribe</a>
</mj-text> </mj-text>
</mj-column> </mj-column>
</mj-group> </mj-group>
@ -236,7 +234,7 @@ const emailSuccessMJML = `<mjml>
<mj-section padding="0" background-url="https://assets.statping.com/greenbackground.png" background-color="#12ab0c"> <mj-section padding="0" background-url="https://assets.statping.com/greenbackground.png" background-color="#12ab0c">
<mj-column> <mj-column>
<mj-image width="250px" href="https://www.sphero.com" src="https://assets.statping.com/statpingcom.png" align="center"></mj-image> <mj-image width="250px" href="https://statping.com" src="https://assets.statping.com/statpingcom.png" align="center"></mj-image>
</mj-column> </mj-column>
</mj-section> </mj-section>
@ -260,8 +258,6 @@ const emailSuccessMJML = `<mjml>
<a class="footer-link" href="https://github.com/statping/statping">Github</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0; <a class="footer-link" href="https://github.com/statping/statping">Github</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
<a class="footer-link" href="https://statping.com/privacy">Privacy</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0; <a class="footer-link" href="https://statping.com/privacy">Privacy</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
<a class="footer-link" href="https://news.statping.com/delete?email={{.Email}}">Unsubscribe</a>
</mj-text> </mj-text>
</mj-column> </mj-column>
</mj-group> </mj-group>

20
types/users/users_test.go
View File

@ -35,16 +35,6 @@ func TestFind(t *testing.T) {
assert.True(t, item.Admin.Bool) assert.True(t, item.Admin.Bool)
} }
func TestAuthUser(t *testing.T) {
u, ok := AuthUser("example_user", utils.HashPassword("password123"))
assert.True(t, ok)
assert.Equal(t, "example_user", u.Username)
u, ok = AuthUser("exampleuser2", "wrongpass")
assert.False(t, ok)
assert.Nil(t, u)
}
func TestFindByUsername(t *testing.T) { func TestFindByUsername(t *testing.T) {
item, err := FindByUsername("example_user") item, err := FindByUsername("example_user")
require.Nil(t, err) require.Nil(t, err)
@ -74,6 +64,16 @@ func TestCreate(t *testing.T) {
assert.NotEmpty(t, example.ApiKey) assert.NotEmpty(t, example.ApiKey)
} }
func TestAuthUser(t *testing.T) {
u, ok := AuthUser("exampleuser2", utils.HashPassword("password12345"))
require.True(t, ok)
assert.Equal(t, "exampleuser2", u.Username)
u, ok = AuthUser("exampleuser2", "wrongpass")
assert.False(t, ok)
assert.Nil(t, u)
}
func TestUpdate(t *testing.T) { func TestUpdate(t *testing.T) {
item, err := Find(1) item, err := Find(1)
require.Nil(t, err) require.Nil(t, err)