Skip to content

Commit f455216

Browse files
UX Review (#27)
Small text changes
1 parent 8c27b04 commit f455216

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

src/main/java/io/jenkins/plugins/sdelements/SDElements.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath filePath, @Nonnull
103103
run.addAction(new SDElementsRiskIndicatorBuildAction(riskIndicator, url, null));
104104
throw new IllegalStateException("Improper connection selected. This is a required setting");
105105
}
106-
taskListener.getLogger().println("SD Elements compliance status: "+(riskIndicator == null ? "Undetermined" : riskIndicator));
106+
taskListener.getLogger().println("SD Elements risk status: "+(riskIndicator == null ? "Undetermined" : riskIndicator));
107107
run.addAction(new SDElementsRiskIndicatorBuildAction(riskIndicator, url, conn.getConnectionString()));
108108
setBuildResult(markUnstable, riskIndicator, run);
109109
}

src/main/java/io/jenkins/plugins/sdelements/SDElementsConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public String getConnectionName() {
4646

4747
@Extension
4848
public static class DescriptorImpl extends Descriptor<SDElementsConnection> {
49-
public String getDisplayName() { return "SDElements connection"; }
49+
public String getDisplayName() { return "SD Elements connection"; }
5050

5151
public ListBoxModel doFillCredentialsIdItems(final @AncestorInPath Item item, @QueryParameter String credentialsId) {
5252
StandardListBoxModel lbm = new StandardListBoxModel();

src/main/resources/index.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?jelly escape-by-default='true'?>
22
<div>
3-
Jenkins integration for Security Compass SDElements tool
3+
Jenkins integration for Security Compass SD Elements tool
44
</div>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div>
2-
The name of the connection to use
2+
The name of the connection
33
</div>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div>
2-
When this checkbox is checked, non compliant results from an SD Element project will mark the build unstable instead of failing it
2+
When this checkbox is checked, non compliant results from an SD Elements project will mark the build unstable instead of failing it
33
</div>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div>
2-
Connection url
2+
Connection URL (for example: https://the.sdeserver.com)
33
</div>

src/test/java/io/jenkins/plugins/sdelements/SDElementsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void testPassingProject() throws Exception {
7171
FreeStyleProject freeStyleProject = createProject("valid-connection", 1742, false);
7272
FreeStyleBuild fsb = freeStyleProject.scheduleBuild2(0, new Cause.UserIdCause()).get();
7373
jr.assertBuildStatus(Result.SUCCESS, fsb);
74-
jr.assertLogContains("SD Elements compliance status: Pass", fsb);
74+
jr.assertLogContains("SD Elements risk status: Pass", fsb);
7575
}
7676

7777
@Test
@@ -81,7 +81,7 @@ public void testFailingProject() throws Exception {
8181
FreeStyleProject fsp = createProject("valid-connection", 1739, false);
8282
FreeStyleBuild fsb = fsp.scheduleBuild2(0, new Cause.UserIdCause()).get();
8383
jr.assertBuildStatus(Result.FAILURE, fsb);
84-
jr.assertLogContains("SD Elements compliance status: Fail", fsb);
84+
jr.assertLogContains("SD Elements risk status: Fail", fsb);
8585
}
8686

8787
@Test
@@ -91,7 +91,7 @@ public void testFailingProjectMarkAsUnstable() throws Exception {
9191
FreeStyleProject fsp = createProject("valid-connection", 1739, true);
9292
FreeStyleBuild fsb = fsp.scheduleBuild2(0, new Cause.UserIdCause()).get();
9393
jr.assertBuildStatus(Result.UNSTABLE, fsb);
94-
jr.assertLogContains("SD Elements compliance status: Fail", fsb);
94+
jr.assertLogContains("SD Elements risk status: Fail", fsb);
9595
}
9696

9797

@@ -102,7 +102,7 @@ public void testUndeterminedProject() throws Exception {
102102
FreeStyleProject fsp = createProject("valid-connection", 1743, false);
103103
FreeStyleBuild fsb = fsp.scheduleBuild2(0, new Cause.UserIdCause()).get();
104104
jr.assertBuildStatus(Result.FAILURE, fsb);
105-
jr.assertLogContains("SD Elements compliance status: Survey not completed", fsb);
105+
jr.assertLogContains("SD Elements risk status: Survey not completed", fsb);
106106
}
107107

108108
@Test

0 commit comments

Comments
 (0)