From 6f3f9ea215afd5ef8f8e8a0c80c4ae0ff42474fd Mon Sep 17 00:00:00 2001
From: David Brougham <dbrougham@diligent.com>
Date: Mon, 1 Nov 2021 17:34:03 +1300
Subject: [PATCH] Reset files back to master

---
 .idea/copyright/ALS2.xml                                   | 7 ++++++-
 .../echo/notification/GithubNotificationAgentSpec.groovy   | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.idea/copyright/ALS2.xml b/.idea/copyright/ALS2.xml
index 665406845..2f6849bb3 100644
--- a/.idea/copyright/ALS2.xml
+++ b/.idea/copyright/ALS2.xml
@@ -1 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><component name="CopyrightManager"><copyright><option name="notice" value="Copyright $today.year Netflix, Inc.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;  http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License."/><option name="myName" value="ALS2"/></copyright></component>
\ No newline at end of file
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright &amp;#36;today.year Netflix, Inc.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;  http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License.&#10;" />
+    <option name="myName" value="ALS2" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy
index 05fd442cf..5ddf199b0 100644
--- a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy
+++ b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy
@@ -33,8 +33,8 @@ import spock.util.concurrent.BlockingVariable
 
 class GithubNotificationAgentSpec extends Specification {
 
-  @Subject
   def github = Mock(GithubService)
+  @Subject
   def agent = new GithubNotificationAgent()
 
   void setup() {
@@ -42,6 +42,7 @@ class GithubNotificationAgentSpec extends Specification {
     agent.setGithubService(github)
   }
 
+
   @Unroll
   def "sets correct status check for #status status in pipeline events"() {
     given:
@@ -108,7 +109,7 @@ class GithubNotificationAgentSpec extends Specification {
     then:
     actualMessage.get().getDescription() == expectedDescription
     actualMessage.get().getTarget_url() == "http://spinnaker.io/#/applications/whatever/executions/details/1?pipeline=foo-pipeline&stage=1"
-    actualMessage.get().getContext() == "foo-pipeline/stage/second stage"
+    actualMessage.get().getContext() == "stage/second stage"
 
     where:
     status     || expectedDescription