Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed EmailNotificationServiceSpec & ApplicationSpec #30

Merged
merged 1 commit into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions echo-notifications/echo-notifications.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@ dependencies {
implementation "io.cloudevents:cloudevents-http-basic:2.5.0"
implementation "io.cloudevents:cloudevents-json-jackson:2.5.0"
implementation ("dev.cdevents:cdevents-sdk-java:0.1.2")
testImplementation("com.icegreen:greenmail:1.5.14") {
exclude group: "com.sun.mail", module: "javax.mail"
}
implementation "org.apache.groovy:groovy:4.0.9"

testImplementation "com.icegreen:greenmail:2.0.1"
testImplementation "org.apache.httpcomponents:httpclient"
testImplementation "org.spockframework:spock-spring"
testImplementation "org.springframework:spring-test"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ import com.icegreen.greenmail.util.GreenMailUtil
import com.icegreen.greenmail.util.ServerSetupTest
import com.netflix.spinnaker.echo.api.Notification
import com.netflix.spinnaker.echo.notification.NotificationTemplateEngine
import jakarta.mail.Message
import jakarta.mail.internet.MimeMessage
import org.springframework.mail.javamail.JavaMailSenderImpl
import spock.lang.Shared
import spock.lang.Specification
import spock.lang.Subject
import spock.lang.Unroll



class EmailNotificationServiceSpec { /*extends Specification
class EmailNotificationServiceSpec extends Specification {
def notificationTemplateEngine = Mock(NotificationTemplateEngine)

@Shared
Expand Down Expand Up @@ -97,5 +96,5 @@ class EmailNotificationServiceSpec { /*extends Specification
['receiver@localhost another@localhost'] | ['some-addr@localhost some-other-addr@localhost'] || ['receiver@localhost', 'another@localhost'] || ['some-addr@localhost', 'some-other-addr@localhost']
['receiver@localhost,another@localhost'] | ['some-addr@localhost,some-other-addr@localhost'] || ['receiver@localhost', 'another@localhost'] || ['some-addr@localhost', 'some-other-addr@localhost']
['receiver@localhost; another@localhost'] | ['some-addr@localhost, some-other-addr@localhost'] || ['receiver@localhost', 'another@localhost'] || ['some-addr@localhost', 'some-other-addr@localhost']
}*/
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
import com.netflix.spinnaker.echo.services.Front50Service;
import com.netflix.spinnaker.fiat.shared.FiatService;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;

/*@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = {Application.class})*/
@SpringBootTest(classes = {Application.class})
@ContextConfiguration(classes = {Application.class})
@TestPropertySource(properties = {"spring.config.location=classpath:echo-test.yml"})
public class ApplicationSpec {
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ spinnakerGradleVersion=1-0-SNAPSHOT
#
#fiatComposite=true
#korkComposite=true

org.gradle.jvmargs=-Xmx2g -Xms2g
Loading