Commit graph

187 commits

Author SHA1 Message Date
d9c71f9756 Fix merge conflict with master branch
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-05-09 11:45:10 +01:00
813db80045 CHANGELOG 2016-05-09 11:41:22 +01:00
492cf8c6e3 pom.xml: version set to 0.4.0 2016-05-09 11:41:22 +01:00
b66a6996b9 Merge pull request #16 from kemitix/upgrade-kemitix-parent-to-1.1.0
Upgrade kemitix-parent to 1.1.0
2016-05-09 11:36:28 +01:00
c3d012084a Upgrade kemitix-parent to 1.1.0
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-05-09 10:50:09 +01:00
9eb8e69993 Merge pull request #15 from kemitix/move-dependency-versions-to-properties
Specify dependency versions in properties
2016-05-09 07:29:05 +01:00
a460bf00ba Specify dependency versions in properties
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-05-08 22:54:22 +01:00
cf1969fdb7 Merge pull request #14 from kemitix/upgrade-kemitix-parent-to-1.0.0
Upgrade kemitix-parent to 1.0.0
2016-05-08 22:46:18 +01:00
995d04e977 Upgrade kemitix-parent to 1.0.0
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-05-08 22:24:00 +01:00
2b04178b33 Merge pull request #13 from kemitix/upgrade-spring-context-support-to-4.2.6
Upgrade spring-context-support to 4.2.6
2016-05-08 22:12:44 +01:00
286d1ad515 Upgrade spring-context-support to 4.2.6
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-05-08 21:04:50 +01:00
5f13a66386 Merge pull request #12 from kemitix/upgrade-simple-java-mail-to-3.0.1
Upgrade to test against simple-java-mail 3.0.1
2016-03-10 12:14:31 +00:00
2f337a4bc5 Upgrade to test against simple-java-mail 3.0.1
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-10 12:08:49 +00:00
c31fca12d7 Merge branch release/0.3.2 into master
Upgrade to test with spring-context-support 4.2.5
Upgrade to test with simple-java-mail 3.0.0
Upgrade kemitix-parent to 0.9.0

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:18:04 +00:00
0506bdd760 Merge branch release/0.3.2 into develop
Upgrade to test with spring-context-support 4.2.5
Upgrade to test with simple-java-mail 3.0.0
Upgrade kemitix-parent to 0.9.0

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:18:04 +00:00
d8509ebc12 CHANGELOG
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:18:04 +00:00
6afca9265b pom.xml: version set to 0.4.0-SNAPSHOT
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:18:04 +00:00
6e0d639a89 pom.xml: version set to 0.3.2
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:18:04 +00:00
1cb847d6e9 Merge pull request #11 from kemitix/upgrade-spring-context-support-to-4.2.5
Upgrade to test with spring-context-support 4.2.5
2016-03-05 15:14:38 +00:00
516fd679c5 Merge pull request #8 from kemitix/upgrade-simple-java-mail-to-3.0.0
Upgrade to test with simple-java-mail 3.0.0
2016-03-05 15:14:27 +00:00
099e77de9a Merge pull request #9 from kemitix/upgrade-kemitix-parent-to-0.9.0
Upgrade kemitix-parent to 0.9.0
2016-03-05 15:14:07 +00:00
1a30f8a9d9 pom.xml: Upgrade to test with spring-context-support 4.2.5
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:09:20 +00:00
b30289aca2 pom.xml: Upgrade to test with simple-java-mail 3.0.0
In simple-java-mail the Email class has been moved into the 'email' package,
thus the Issue1Test had to be updated. This doesn't affect how
wiser-assertions is used.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:07:59 +00:00
9c82829c5d pom.xml: Upgrade kemitix-parent to 0.9.0
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 14:58:11 +00:00
3d8f1c2f1c Merge branch release/0.3.1 into develop
Add support for Spring Mail's SimpleMailMessage [fixes #6]
Upgrade kemitix-parent to 0.7.1

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
8d11da09e9 Merge branch release/0.3.1 into master
Add support for Spring Mail's SimpleMailMessage [fixes #6]
Upgrade kemitix-parent to 0.7.1

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
86ec41b504 pom.xml: version set to 0.4.0-SNAPSHOT
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
3e7d686f3c CHANGELOG
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
02c78852af pom.xml: version set to 0.3.1
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
2309ce04f0 Merge pull request #7 from kemitix/issue-6-unexpected-mimemessage-content-in-withcontentcontains
Fix Issue 6 Unexpected mimeMessage content in withContentContains
2016-02-16 23:06:35 +00:00
eff6e6c0b3 WiserAssertions.getMimeMessageBody: accept that content may be a String
Spring's SimpleMailMessage doesn't wrap it's email body in a mime content
type as it is just a 'simple' mail message.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:55:38 +00:00
146f53e404 AbstractWiserTest: always create a new Session for each test
Otherwise properties are ignored on subsequent calls.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:53:44 +00:00
06c48f4444 AbstractWiserTest: fix refactoring artifact and use constant directly
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:52:21 +00:00
a11b2fcdd4 Issue6Test: assert from, to and withSubject to match submitted issue
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:51:31 +00:00
311eda0299 Issue6Test: add regression test for issue 6
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:26:31 +00:00
850d9948ad Merge branch 'upgrade-kemitix-parent-to-0.7.1' into develop
* upgrade-kemitix-parent-to-0.7.1:
  pom.xml: Upgrade kemitix-parent to 0.7.1
2016-02-16 21:42:54 +00:00
6b7ea83051 pom.xml: Upgrade kemitix-parent to 0.7.1
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 21:42:27 +00:00
cbb3b12832 Merge branch release/0.3.0 into master
Add support for nested multi-part emails [jonjo-manywho] [#1]

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:47 +00:00
209c33df01 Merge branch release/0.3.0 into develop
Add support for nested multi-part emails [jonjo-manywho] [#1]

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:47 +00:00
b9c6226245 pom.xml: version set to 0.4.0-SNAPSHOT
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:47 +00:00
78738e83ed CHANGELOG
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:46 +00:00
b7b5e1d74f pom.xml: version set to 0.3.0
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:46 +00:00
e9adcbb872 Merge pull request #5 from kemitix/issue-1-nested-multipart-mails
Issue #1: Add support for nested multipart messages
2016-01-25 13:24:53 +00:00
04870102a2 Normalise formatting (comments and white space only).
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:20:31 +00:00
6b866a0ddd Merge pull request #4 from jonjo-manywho/issue-1-nested-multipart-mails
Issue #1: Add support for nested multipart messages
2016-01-25 13:09:07 +00:00
Jonjo McKay
d624902cfd Issue #1: Add support for nested multipart messages 2016-01-25 13:03:42 +00:00
4f8fbe50c5 Merge pull request #3 from kemitix/switch-to-kemitix-parent
Switch to kemitix-parent as parent pom
2016-01-25 12:26:08 +00:00
8aa0f2c1c5 checkstyle.xml: updated to be slightly less strict
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 12:16:57 +00:00
911c0dd3b3 WiserAssertionsTest: fix line wrapping
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 12:11:42 +00:00
ebba0760c4 pom.xml: switch parent to kemitix-parent
Need to specify versions for junit and mockito-core ourselves now.
2016-01-25 12:11:21 +00:00