Review refactor

Author: dubee

commands/trigger.go

@@ -20,6 +20,7 @@ package commands
 import (
 	"errors"
 	"fmt"
+	"net/http"
 
 	"github.com/apache/incubator-openwhisk-cli/wski18n"
 	"github.com/apache/incubator-openwhisk-client-go/whisk"
@@ -128,9 +129,9 @@ var triggerFireCmd = &cobra.Command{
 			return werr
 		}
 
-		if resp.StatusCode == 204 {
+		if resp.StatusCode == http.StatusNoContent {
 			fmt.Fprintf(color.Output,
-				wski18n.T("trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule(s)\n",
+				wski18n.T("trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule\n",
 					map[string]interface{}{
 						"namespace": boldString(qualifiedName.GetNamespace()),
 						"name":      boldString(qualifiedName.GetEntityName())}))

tests/src/test/scala/system/basic/WskCliBasicTests.scala

@@ -757,10 +757,8 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
         trigger.create(triggerName)
       }
 
-      val rr = wsk.trigger.fire(triggerName)
-      val ns = wsk.namespace.whois()
-
-      rr.stdout should include regex(s"trigger /.*/$triggerName did not fire as it is not associated with an active rule\\(s\\)")
+      wsk.trigger.fire(triggerName)
+        .stdout should include regex(s"trigger /.*/$triggerName did not fire as it is not associated with an active rule")
   }
 
   behavior of "Wsk Rule CLI"

wski18n/resources/en_US.all.json

@@ -626,8 +626,8 @@
     "translation": "{{.ok}} triggered /{{.namespace}}/{{.name}} with id {{.id}}\n"
   },
   {
-    "id": "trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule(s)\n",
-    "translation": "trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule(s)\n"
+    "id": "trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule\n",
+    "translation": "trigger /{{.namespace}}/{{.name}} did not fire as it is not associated with an active rule\n"
   },
   {
     "id": "create new trigger",