lilfade/Activity-Relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix bugs for unfollow cli.

Browse Source
This commit is contained in:
Naoki Kosaka 2019-01-06 12:34:52 +09:00
parent 63c6216b6a
commit 93e3a8e4f5
4 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/domain.go
View File

@ -126,8 +126,8 @@ func unfollowDomains(cmd *cobra.Command, args []string) error {
relayState.DelSubscription(subscription.Domain) relayState.DelSubscription(subscription.Domain)
break break
} }
fmt.Println("Invalid domain given")
} }
cmd.Println("Invalid domain [" + domain + "] given")
} }
return nil return nil

30
cli/domain_test.go
View File

@ -198,21 +198,39 @@ func TestUnfollowDomain(t *testing.T) {
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"}) app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
app.Execute() app.Execute()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
app.SetArgs([]string{"domain", "unfollow", "subscription.example.jp"}) app.SetArgs([]string{"domain", "unfollow", "subscription.example.jp"})
app.Execute() app.Execute()
valid := true valid := true
for _, domain := range relayState.LimitedDomains { for _, domain := range relayState.Subscriptions {
if domain == "subscription.example.jp" { if domain.Domain == "subscription.example.jp" {
valid = false valid = false
} }
} }
if !valid { if !valid {
t.Fatalf("Do not unfollow domain") t.Fatalf("Not unfollowed domain")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestInvalidUnfollowDomain(t *testing.T) {
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
app.Execute()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
app.SetArgs([]string{"domain", "unfollow", "unknown.tld"})
app.Execute()
output := buffer.String()
if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
t.Fatalf("Invalid Responce.")
} }
relayState.RedisClient.FlushAll().Result() relayState.RedisClient.FlushAll().Result()

4
cli/follow.go
View File

@ -137,7 +137,7 @@ func acceptFollow(cmd *cobra.Command, args []string) error {
break break
} }
} }
cmd.Println("Invalid domain given") cmd.Println("Invalid domain [" + domain + "] given")
} }
return nil return nil
@ -161,8 +161,8 @@ func rejectFollow(cmd *cobra.Command, args []string) error {
createFollowRequestResponse(domain, "Reject") createFollowRequestResponse(domain, "Reject")
break break
} }
cmd.Println("Invalid domain given")
} }
cmd.Println("Invalid domain [" + domain + "] given")
} }
return nil return nil

20
cli/follow_test.go
View File

@ -102,7 +102,25 @@ func TestInvalidFollow(t *testing.T) {
app.Execute() app.Execute()
output := buffer.String() output := buffer.String()
if strings.Split(output, "\n")[0] != "Invalid domain given" { if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
t.Fatalf("Invalid Responce.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestInvalidRejectFollow(t *testing.T) {
app := buildNewCmd()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
app.SetArgs([]string{"follow", "reject", "unknown.tld"})
app.Execute()
output := buffer.String()
if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
t.Fatalf("Invalid Responce.") t.Fatalf("Invalid Responce.")
} }