mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-28 22:52:47 +00:00
Correct v1 regression tests
This commit is contained in:
parent
c407b9b779
commit
e2af3cf510
|
@ -278,8 +278,9 @@ func (suite *FiltersTestSuite) TestPutNonexistentFilter() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// setFilterExpiration sets filter expiration.
|
// setFilterExpiration sets filter expiration.
|
||||||
func (suite *FiltersTestSuite) setFilterExpiration(id string, expiresIn *int, expiresInStr *string, requestJson *string) *apimodel.FilterV1 {
|
func (suite *FiltersTestSuite) setFilterExpiration(id string, phrase *string, expiresIn *int, expiresInStr *string, requestJson *string) *apimodel.FilterV1 {
|
||||||
filter, err := suite.putFilter(id, nil, nil, nil, nil, expiresIn, expiresInStr, requestJson, http.StatusOK, "")
|
context := []string{"home"}
|
||||||
|
filter, err := suite.putFilter(id, phrase, &context, nil, nil, expiresIn, expiresInStr, requestJson, http.StatusOK, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
suite.FailNow(err.Error())
|
suite.FailNow(err.Error())
|
||||||
}
|
}
|
||||||
|
@ -288,36 +289,42 @@ func (suite *FiltersTestSuite) setFilterExpiration(id string, expiresIn *int, ex
|
||||||
|
|
||||||
// Regression test for https://github.com/superseriousbusiness/gotosocial/issues/3497
|
// Regression test for https://github.com/superseriousbusiness/gotosocial/issues/3497
|
||||||
func (suite *FiltersTestSuite) TestPutFilterUnsetExpirationDateEmptyString() {
|
func (suite *FiltersTestSuite) TestPutFilterUnsetExpirationDateEmptyString() {
|
||||||
id := suite.testFilters["local_account_1_filter_2"].ID
|
filterKeyword := suite.testFilterKeywords["local_account_1_filter_1_keyword_1"]
|
||||||
|
id := filterKeyword.ID
|
||||||
|
phrase := filterKeyword.Keyword
|
||||||
|
|
||||||
// Setup: set an expiration date for the filter.
|
// Setup: set an expiration date for the filter.
|
||||||
expiresIn := 86400
|
expiresIn := 86400
|
||||||
filter := suite.setFilterExpiration(id, &expiresIn, nil, nil)
|
filter := suite.setFilterExpiration(id, &phrase, &expiresIn, nil, nil)
|
||||||
if !suite.NotNil(filter.ExpiresAt) {
|
if !suite.NotNil(filter.ExpiresAt) {
|
||||||
suite.FailNow("Test precondition failed")
|
suite.FailNow("Test precondition failed")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unset the filter's expiration date by setting it to an empty string.
|
// Unset the filter's expiration date by setting it to an empty string.
|
||||||
expiresInStr := ""
|
expiresInStr := ""
|
||||||
filter = suite.setFilterExpiration(id, nil, &expiresInStr, nil)
|
filter = suite.setFilterExpiration(id, &phrase, nil, &expiresInStr, nil)
|
||||||
suite.Nil(filter.ExpiresAt)
|
suite.Nil(filter.ExpiresAt)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Regression test related to https://github.com/superseriousbusiness/gotosocial/issues/3497
|
// Regression test related to https://github.com/superseriousbusiness/gotosocial/issues/3497
|
||||||
func (suite *FiltersTestSuite) TestPutFilterUnsetExpirationDateNullJSON() {
|
func (suite *FiltersTestSuite) TestPutFilterUnsetExpirationDateNullJSON() {
|
||||||
id := suite.testFilters["local_account_1_filter_3"].ID
|
filterKeyword := suite.testFilterKeywords["local_account_1_filter_1_keyword_1"]
|
||||||
|
id := filterKeyword.ID
|
||||||
|
phrase := filterKeyword.Keyword
|
||||||
|
|
||||||
// Setup: set an expiration date for the filter.
|
// Setup: set an expiration date for the filter.
|
||||||
expiresIn := 86400
|
expiresIn := 86400
|
||||||
filter := suite.setFilterExpiration(id, &expiresIn, nil, nil)
|
filter := suite.setFilterExpiration(id, &phrase, &expiresIn, nil, nil)
|
||||||
if !suite.NotNil(filter.ExpiresAt) {
|
if !suite.NotNil(filter.ExpiresAt) {
|
||||||
suite.FailNow("Test precondition failed")
|
suite.FailNow("Test precondition failed")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unset the filter's expiration date by setting it to a null literal.
|
// Unset the filter's expiration date by setting it to a null literal.
|
||||||
requestJson := `{
|
requestJson := `{
|
||||||
|
"phrase": "fnord",
|
||||||
|
"context": ["home"],
|
||||||
"expires_in": null
|
"expires_in": null
|
||||||
}`
|
}`
|
||||||
filter = suite.setFilterExpiration(id, nil, nil, &requestJson)
|
filter = suite.setFilterExpiration(id, nil, nil, nil, &requestJson)
|
||||||
suite.Nil(filter.ExpiresAt)
|
suite.Nil(filter.ExpiresAt)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue