IssueShowWS : Rename action 'severity' by 'set_severity' and fix test on comments

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
index 00f9f3a5951bc9f23df4f6e20fbe310695229e07..463515e35bed42ab3c3d4348380cab0aac2bd26e 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
@@ -156,7 +156,7 @@ public class IssueShowWsHandler implements RequestHandler {
         }
         actions.add("plan");
         if (UserSession.get().hasProjectPermission(UserRole.ISSUE_ADMIN, issue.projectKey())) {
-          actions.add("severity");
+          actions.add("set_severity");
         }
         for (Action action : actionService.listAvailableActions(issue)) {
           actions.add(action.key());

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index 6ae5c82255f2c91437fef2904830df65ce4b17c3..24a07d868d00041cb197bf0bba689505ba472756 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -64,7 +64,7 @@
         assigned_to:    '<%= escape_javascript message('assigned_to') -%>',
         plan:           '<%= escape_javascript message('issue.do_plan') -%>',
         planned_for:    '<%= escape_javascript message('issue.planned_for') -%>',
-        severity:       '<%= escape_javascript message('issue.set_severity') -%>',
+        set_severity:   '<%= escape_javascript message('issue.set_severity') -%>',
         <%  Internal.issues.listPluginActions().each do |action| -%>
           '<%= escape_javascript action -%>': '<%= escape_javascript message("issue.action.#{action}.formlink") -%>',
         <% end -%>

diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
index cb3fe8c35bd01cb6b19ef33207d029296f5b0ff2..1c0983d4d0c99717a61099c3c0a8f077bb285f73 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
@@ -261,14 +261,14 @@ public class IssueShowWsHandlerTest {
   }
 
   @Test
-  public void show_issue_with_severity_action() throws Exception {
+  public void show_issue_with_set_severity_action() throws Exception {
     DefaultIssue issue = createStandardIssue()
       .setStatus("OPEN");
     issues.add(issue);
 
     MockUserSession.set().setLogin("john").addProjectPermissions(UserRole.ISSUE_ADMIN, issue.projectKey());
     WsTester.TestRequest request = tester.newRequest("show").setParam("key", issue.key());
-    request.execute().assertJson(getClass(), "show_issue_with_severity_action.json");
+    request.execute().assertJson(getClass(), "show_issue_with_set_severity_action.json");
   }
 
   @Test

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_comments.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_comments.json
index 431c6461cf3eda2a427f70503bb9ca67344cb20b..39be419acda32999bdd1b3edb111ea89280ce677 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_comments.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_comments.json
@@ -27,7 +27,7 @@
         "raw": "Another comment",
         "html": "Another comment",
         "createdAt": "2014-02-23T19:10:03+0100",
-        "fCreatedAtAge": "10 days",
+        "fCreatedAge": "10 days",
         "updatable": true
       }
     ],

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_set_severity_action.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_set_severity_action.json
new file mode 100644 (file)
index 0000000..84547bc
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_set_severity_action.json
@@ -0,0 +1,20 @@
+{
+  "issue": {
+    "key": "ABCD",
+    "component": "org.sonar.server.issue.IssueClient",
+    "componentLongName": "SonarQube :: Issue Client",
+    "componentQualifier": "FIL",
+    "project": "org.sonar.Sonar",
+    "projectLongName": "SonarQube",
+    "rule": "squid:AvoidCycle",
+    "ruleName": "Avoid cycle",
+    "status": "OPEN",
+    "creationDate": "2014-01-22T19:10:03+0100",
+    "transitions": [],
+    "actions": [
+       "comment", "assign", "assign_to_me", "plan", "set_severity"
+    ],
+    "comments": [],
+    "changelog": []
+  }
+}

diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_severity_action.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_severity_action.json
deleted file mode 100644 (file)
index 6fbed89..0000000
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_severity_action.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "issue": {
-    "key": "ABCD",
-    "component": "org.sonar.server.issue.IssueClient",
-    "componentLongName": "SonarQube :: Issue Client",
-    "componentQualifier": "FIL",
-    "project": "org.sonar.Sonar",
-    "projectLongName": "SonarQube",
-    "rule": "squid:AvoidCycle",
-    "ruleName": "Avoid cycle",
-    "status": "OPEN",
-    "creationDate": "2014-01-22T19:10:03+0100",
-    "transitions": [],
-    "actions": [
-       "comment", "assign", "assign_to_me", "plan", "severity"
-    ],
-    "comments": [],
-    "changelog": []
-  }
-}