Replacing require.nil in model package (#16953)
* Replacing require.nil in model package * Fixing tests * Update model/file_info_test.go Co-authored-by: Doug Lauder <wiggin77@warpmail.net> * Update model/file_info_test.go Co-authored-by: Doug Lauder <wiggin77@warpmail.net> Co-authored-by: Doug Lauder <wiggin77@warpmail.net> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
0d6c8f4f72
Коммит
6b388871a9
@@ -12,34 +12,34 @@ import (
|
||||
|
||||
func TestAutocompleteData(t *testing.T) {
|
||||
ad := NewAutocompleteData("jira", "", "Available commands:")
|
||||
assert.Nil(t, ad.IsValid())
|
||||
assert.NoError(t, ad.IsValid())
|
||||
ad.RoleID = "some_id"
|
||||
assert.NotNil(t, ad.IsValid())
|
||||
assert.Error(t, ad.IsValid())
|
||||
ad.RoleID = SYSTEM_ADMIN_ROLE_ID
|
||||
assert.Nil(t, ad.IsValid())
|
||||
assert.NoError(t, ad.IsValid())
|
||||
ad.AddDynamicListArgument("help", "/some/url", true)
|
||||
assert.Nil(t, ad.IsValid())
|
||||
assert.NoError(t, ad.IsValid())
|
||||
ad.AddNamedTextArgument("name", "help", "[text]", "", true)
|
||||
assert.Nil(t, ad.IsValid())
|
||||
assert.NoError(t, ad.IsValid())
|
||||
|
||||
ad = getAutocompleteData()
|
||||
assert.Nil(t, ad.IsValid())
|
||||
assert.NoError(t, ad.IsValid())
|
||||
command := NewAutocompleteData("", "", "")
|
||||
ad.AddCommand(command)
|
||||
assert.NotNil(t, ad.IsValid())
|
||||
assert.Error(t, ad.IsValid())
|
||||
|
||||
ad = getAutocompleteData()
|
||||
command = NewAutocompleteData("disconnect", "", "disconnect")
|
||||
command.AddTextArgument("help", "[text]", "")
|
||||
command.AddNamedTextArgument("some", "help", "[text]", "", true)
|
||||
ad.AddCommand(command)
|
||||
assert.Nil(t, ad.IsValid())
|
||||
assert.NoError(t, ad.IsValid())
|
||||
|
||||
ad = getAutocompleteData()
|
||||
command = NewAutocompleteData("disconnect", "", "disconnect")
|
||||
command.AddDynamicListArgument("help", "valid_url", true)
|
||||
ad.AddCommand(command)
|
||||
assert.Nil(t, ad.IsValid())
|
||||
assert.NoError(t, ad.IsValid())
|
||||
|
||||
ad = getAutocompleteData()
|
||||
command = NewAutocompleteData("disconnect", "", "disconnect")
|
||||
@@ -53,24 +53,24 @@ func TestAutocompleteData(t *testing.T) {
|
||||
}
|
||||
command.AddStaticListArgument("help", true, items)
|
||||
ad.AddCommand(command)
|
||||
assert.NotNil(t, ad.IsValid())
|
||||
assert.Error(t, ad.IsValid())
|
||||
|
||||
ad = getAutocompleteData()
|
||||
ad.AddCommand(nil)
|
||||
assert.NotNil(t, ad.IsValid())
|
||||
assert.Error(t, ad.IsValid())
|
||||
|
||||
ad = getAutocompleteData()
|
||||
command = NewAutocompleteData("Disconnect", "", "")
|
||||
ad.AddCommand(command)
|
||||
assert.NotNil(t, ad.IsValid())
|
||||
assert.Error(t, ad.IsValid())
|
||||
}
|
||||
|
||||
func TestAutocompleteDataJSON(t *testing.T) {
|
||||
ad := getAutocompleteData()
|
||||
b, err := ad.ToJSON()
|
||||
assert.Nil(t, err)
|
||||
assert.NoError(t, err)
|
||||
ad2, err := AutocompleteDataFromJSON(b)
|
||||
assert.Nil(t, err)
|
||||
assert.NoError(t, err)
|
||||
assert.True(t, ad2.Equals(ad))
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ func TestUpdateRelativeURLsForPluginCommands(t *testing.T) {
|
||||
ad := getAutocompleteData()
|
||||
baseURL, _ := url.Parse("http://localhost:8065/plugins/com.mattermost.demo-plugin")
|
||||
err := ad.UpdateRelativeURLsForPluginCommands(baseURL)
|
||||
assert.Nil(t, err)
|
||||
assert.NoError(t, err)
|
||||
arg, ok := ad.SubCommands[0].Arguments[2].Data.(*AutocompleteDynamicListArg)
|
||||
assert.True(t, ok)
|
||||
assert.Equal(t, "http://localhost:8065/plugins/com.mattermost.demo-plugin/other/url", arg.FetchURL)
|
||||
|
||||
Ссылка в новой задаче
Block a user