Some cleanup

elastic · Jun 8, 2020 · f986469 · f986469
1 parent 64c081e
commit f986469
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/.ci/pipeline-library/README.md b/.ci/pipeline-library/README.md
@@ -3,5 +3,6 @@
 ## Running tests
 
 ```bash
+cd .ci/pipeline-library
 ./gradlew test
 ```
diff --git a/.ci/pipeline-library/src/test/KibanaBasePipelineTest.groovy b/.ci/pipeline-library/src/test/KibanaBasePipelineTest.groovy
@@ -6,8 +6,8 @@ class KibanaBasePipelineTest extends BasePipelineTest {
   Map params = [:]
 
   public def Mocks = [
-    TEST_FAILURE_URL: "https://localhost/",
-    TEST_FAILURE_NAME: "Kibana Pipeline / kibana-xpack-agent / Chrome X-Pack UI Functional Tests.x-pack/test/functional/apps/fake/test·ts.Fake test <Component> should & pass &",
+    TEST_FAILURE_URL: 'https://localhost/',
+    TEST_FAILURE_NAME: 'Kibana Pipeline / kibana-xpack-agent / Chrome X-Pack UI Functional Tests.x-pack/test/functional/apps/fake/test·ts.Fake test <Component> should & pass &',
   ]
 
   @Before
@@ -28,7 +28,7 @@ class KibanaBasePipelineTest extends BasePipelineTest {
 
     props([
       buildUtils: [
-        getBuildStatus: { "SUCCESS" },
+        getBuildStatus: { 'SUCCESS' },
         printStacktrace: { ex -> print ex },
       ],
       jenkinsApi: [ getFailedSteps: { [] } ],
@@ -40,11 +40,15 @@ class KibanaBasePipelineTest extends BasePipelineTest {
       params: params,
     ])
 
-    ['withGithubCredentials'].each {
+    // Some wrappers that can just be mocked to immediately call the closure passed in
+    [
+      'catchError',
+      'catchErrors',
+      'timestamps',
+      'withGithubCredentials',
+    ].each {
       helper.registerAllowedMethod(it, [Closure.class], null)
     }
-
-    helper.registerAllowedMethod('slackSend', [Map.class], null)
   }
 
   void props(Map properties) {
@@ -74,17 +78,17 @@ class KibanaBasePipelineTest extends BasePipelineTest {
   void mockFailureBuild() {
     props([
       buildUtils: [
-        getBuildStatus: { "FAILURE" },
+        getBuildStatus: { 'FAILURE' },
         printStacktrace: { ex -> print ex },
       ],
       jenkinsApi: [ getFailedSteps: { [
         [
-          displayName: "Check out from version control",
-          logs: "http://jenkins.localhost:8080",
+          displayName: 'Check out from version control',
+          logs: 'http://jenkins.localhost:8080',
         ],
         [
-          displayName: "Execute test task",
-          logs: "http://jenkins.localhost:8080",
+          displayName: 'Execute test task',
+          logs: 'http://jenkins.localhost:8080',
         ],
       ] } ],
       testUtils: [

diff --git a/.ci/pipeline-library/src/test/slackNotifications.groovy b/.ci/pipeline-library/src/test/slackNotifications.groovy
@@ -8,7 +8,8 @@ class SlackNotificationsTest extends KibanaBasePipelineTest {
   void setUp() {
     super.setUp()
 
-    slackNotifications = loadScript("vars/slackNotifications.groovy")
+    helper.registerAllowedMethod('slackSend', [Map.class], null)
+    slackNotifications = loadScript('vars/slackNotifications.groovy')
   }
 
   @Test
@@ -32,9 +33,9 @@ class SlackNotificationsTest extends KibanaBasePipelineTest {
     def args = fnMock('slackSend').args[0]
 
     def expected = [
-      channel: "#kibana-operations-alerts",
-      username: "Kibana Operations",
-      iconEmoji: ":jenkins:",
+      channel: '#kibana-operations-alerts',
+      username: 'Kibana Operations',
+      iconEmoji: ':jenkins:',
       color: 'danger',
       message: ':broken_heart: elastic / kibana # master #1',
     ]