UX Review (#27)

Small text changes
Praqma · May 3, 2018 · f455216 · f455216
1 parent 8c27b04
commit f455216
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/io/jenkins/plugins/sdelements/SDElements.java b/src/main/java/io/jenkins/plugins/sdelements/SDElements.java
@@ -103,7 +103,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath filePath, @Nonnull
             run.addAction(new SDElementsRiskIndicatorBuildAction(riskIndicator, url, null));
             throw new IllegalStateException("Improper connection selected. This is a required setting");
         }
-        taskListener.getLogger().println("SD Elements compliance status: "+(riskIndicator == null ? "Undetermined" : riskIndicator));
+        taskListener.getLogger().println("SD Elements risk status: "+(riskIndicator == null ? "Undetermined" : riskIndicator));
         run.addAction(new SDElementsRiskIndicatorBuildAction(riskIndicator, url, conn.getConnectionString()));
         setBuildResult(markUnstable, riskIndicator, run);
     }

diff --git a/src/main/java/io/jenkins/plugins/sdelements/SDElementsConnection.java b/src/main/java/io/jenkins/plugins/sdelements/SDElementsConnection.java
@@ -46,7 +46,7 @@ public String getConnectionName() {
 
     @Extension
     public static class DescriptorImpl extends Descriptor<SDElementsConnection> {
-        public String getDisplayName() { return "SDElements connection"; }
+        public String getDisplayName() { return "SD Elements connection"; }
 
         public ListBoxModel doFillCredentialsIdItems(final @AncestorInPath Item item, @QueryParameter String credentialsId) {
             StandardListBoxModel lbm = new StandardListBoxModel();

diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <div>
-    Jenkins integration for Security Compass SDElements tool
+    Jenkins integration for Security Compass SD Elements tool
 </div>
diff --git a/src/main/resources/io/jenkins/plugins/sdelements/SDElements/help-connectionName.html b/src/main/resources/io/jenkins/plugins/sdelements/SDElements/help-connectionName.html
@@ -1,3 +1,3 @@
 <div>
-    The name of the connection to use
+    The name of the connection
 </div>
diff --git a/src/main/resources/io/jenkins/plugins/sdelements/SDElements/help-markUnstable.html b/src/main/resources/io/jenkins/plugins/sdelements/SDElements/help-markUnstable.html
@@ -1,3 +1,3 @@
 <div>
-    When this checkbox is checked, non compliant results from an SD Element project will mark the build unstable instead of failing it
+    When this checkbox is checked, non compliant results from an SD Elements project will mark the build unstable instead of failing it
 </div>
diff --git a/...n/resources/io/jenkins/plugins/sdelements/SDElementsConnection/help-connectionString.html b/...n/resources/io/jenkins/plugins/sdelements/SDElementsConnection/help-connectionString.html
@@ -1,3 +1,3 @@
 <div>
-    Connection url
+    Connection URL (for example: https://the.sdeserver.com)
 </div>
diff --git a/src/test/java/io/jenkins/plugins/sdelements/SDElementsTest.java b/src/test/java/io/jenkins/plugins/sdelements/SDElementsTest.java
@@ -71,7 +71,7 @@ public void testPassingProject() throws Exception {
         FreeStyleProject freeStyleProject = createProject("valid-connection", 1742, false);
         FreeStyleBuild fsb = freeStyleProject.scheduleBuild2(0, new Cause.UserIdCause()).get();
         jr.assertBuildStatus(Result.SUCCESS, fsb);
-        jr.assertLogContains("SD Elements compliance status: Pass", fsb);
+        jr.assertLogContains("SD Elements risk status: Pass", fsb);
     }
 
     @Test
@@ -81,7 +81,7 @@ public void testFailingProject() throws Exception {
         FreeStyleProject fsp = createProject("valid-connection", 1739, false);
         FreeStyleBuild fsb = fsp.scheduleBuild2(0, new Cause.UserIdCause()).get();
         jr.assertBuildStatus(Result.FAILURE, fsb);
-        jr.assertLogContains("SD Elements compliance status: Fail", fsb);
+        jr.assertLogContains("SD Elements risk status: Fail", fsb);
     }
 
     @Test
@@ -91,7 +91,7 @@ public void testFailingProjectMarkAsUnstable() throws Exception {
         FreeStyleProject fsp = createProject("valid-connection", 1739, true);
         FreeStyleBuild fsb = fsp.scheduleBuild2(0, new Cause.UserIdCause()).get();
         jr.assertBuildStatus(Result.UNSTABLE, fsb);
-        jr.assertLogContains("SD Elements compliance status: Fail", fsb);
+        jr.assertLogContains("SD Elements risk status: Fail", fsb);
     }
 
 
@@ -102,7 +102,7 @@ public void testUndeterminedProject() throws Exception {
         FreeStyleProject fsp = createProject("valid-connection", 1743, false);
         FreeStyleBuild fsb = fsp.scheduleBuild2(0, new Cause.UserIdCause()).get();
         jr.assertBuildStatus(Result.FAILURE, fsb);
-        jr.assertLogContains("SD Elements compliance status: Survey not completed", fsb);
+        jr.assertLogContains("SD Elements risk status: Survey not completed", fsb);
     }
 
     @Test