Merged latest changes from trunk.
git-svn-id: https://svn.apache.org/repos/asf/esme/branches/lift-2.4@1171002 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/server/src/main/scala/org/apache/esme/api/API2.scala b/server/src/main/scala/org/apache/esme/api/API2.scala
index 0f01eb4..f3e98ff 100644
--- a/server/src/main/scala/org/apache/esme/api/API2.scala
+++ b/server/src/main/scala/org/apache/esme/api/API2.scala
@@ -513,7 +513,7 @@
val ret: Box[Tuple3[Int,Map[String,String],Box[Elem]]] =
for (user <- User.currentUser;
action <- findAction(actionId);
- enabled <- S.param("enabled").map(toBoolean) ?~ S.?("base_rest_api_err_missing_param", "enable"))
+ val enabled = S.param("enabled").map(toBoolean).openOr(action.enabled))
yield {
action.disabled(!enabled).save
(200,Map(),Full(action.toXml))
diff --git a/server/src/test/scala/org/apache/esme/api/API2Test.scala b/server/src/test/scala/org/apache/esme/api/API2Test.scala
index ea57201..9bf5e97 100644
--- a/server/src/test/scala/org/apache/esme/api/API2Test.scala
+++ b/server/src/test/scala/org/apache/esme/api/API2Test.scala
@@ -548,24 +548,31 @@
}
}
- /*
- * "/user/actions/ACTIONID PUT" in {
- * "with valid session" in {
- * for {
- * sess <- post_session
- * res <- sess.put("user/actions/1","enabled"->0)
- * } {
- * res.code must be equalTo 200
- * }
- * }
- *
- * "with no session returns 403 (forbidden)" in {
- * for(res <- post("user/actions/1","enabled"->0)) {
- * res.code must be equalTo 403
- * }
- * }
- * }
- */
+/* "/user/actions/ACTIONID PUT" in {
+ * "with valid session" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1", "enabled" -> "0")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no enabled parameter" in {
+ * for {
+ * sess <- post_session
+ * res <- sess.put("user/actions/1")
+ * } {
+ * res.code must be equalTo 200
+ * }
+ * }
+ *
+ * "with no session returns 403 (forbidden)" in {
+ * for(res <- put("user/actions/1", "enabled" -> "0")) {
+ * res.code must be equalTo 403
+ * }
+ * }
+ * } */
// Brittle, brittle, brittle
"/user/actions/ACTIONID DELETE" in {
diff --git a/server/src/test/scala/org/apache/esme/api/ApiTest.scala b/server/src/test/scala/org/apache/esme/api/ApiTest.scala
index 58e0fba..94a17e6 100644
--- a/server/src/test/scala/org/apache/esme/api/ApiTest.scala
+++ b/server/src/test/scala/org/apache/esme/api/ApiTest.scala
@@ -202,18 +202,14 @@
"SendMessageToken" in {
for{
send_msg <- post("/api/send_msg", "token" -> token, "message" -> "mymessage") !@ "Failed to send_msg with token" if (testSuccess(send_msg))
- } {
- println(send_msg.xml)
- }
+ } { }
}
"AddPool" in {
for{
login <- post("/api/login", "token" -> token) !@ "Failed to log in" if (testSuccess(login))
add_pool <- login.post("/api/add_pool/ttt87") !@ "Failed to add a pool" if (testSuccess(add_pool))
- } {
- //println(add_pool.xml)
- }
+ } { }
}
"AddPoolNeg" in {
@@ -236,9 +232,7 @@
"SendMessageTokenNeg" in {
for{
send_msg1 <- post("/api/send_msg", "token" -> token) !@ "send_msg should have failed with no message" if shouldnt(testSuccess(send_msg1))
- } {
- println(send_msg1.xml)
- }
+ } { }
}
}
