296 Commits

Author SHA1 Message Date
Marcin Grzejszczak
d385d67331 Fixed invalid setting of custom port for AutoConfigureWireMock; fixes gh-2074 2023-12-29 16:00:17 +01:00
Paulius Paplauskas
0ca1a20940 Use prepareTestInstance phase instead of beforeTestClass phase (#1996)
* use prepareTestInstance phase instead of beforeTestClass phase to check wiremock config

* code style changes
2023-09-26 15:21:16 +02:00
Marcin Grzejszczak
a15db490f1 Defaults the WireMock server port to 8080; fixes gh-1920 2023-09-04 18:32:32 +02:00
Marcin Grzejszczak
ab9d7f5616 Using different fixed ports 2023-06-15 16:12:59 +02:00
Marcin Grzejszczak
847562926a Updated code to remove checkstyle issues 2022-09-01 12:49:06 +02:00
Marcin Grzejszczak
bc6742b67e Merge branch 'jhh992000-3.0.x' into 3.1.x 2022-09-01 12:04:58 +02:00
Huneea
0047ae451d test: add test case - find stub file in jar 2022-09-01 04:11:45 +09:00
Huneea
51045cc97e fix: Fixed an issue that could not find a resources in the jar file
- Issues that occur when executing jar
2022-08-31 01:39:50 +09:00
Marcin Grzejszczak
4d86751b26 Merge branch '3.0.x' into 3.1.x 2022-06-27 17:58:29 +02:00
Marcin Grzejszczak
7d8ea60344 Fixed the changed relative path calculation 2022-06-27 17:58:20 +02:00
Marcin Grzejszczak
60be47be07 Merge branch '3.0.x' into 3.1.x 2022-06-20 17:00:02 +02:00
huneea
5f5a2c93bc fix: support multiple stubs files directories (bug fix) (#1801)
* fix: support multiple stubs files directories (bug fix)

- fix methods
  - ResourcesFileSource - child()
  - ResourcesFileSource - getBinaryFileNamed()
- add test case.
- add test stubs files.

* style: change import order

* style: apply checkstyle and add license header.
2022-06-20 16:53:43 +02:00
devdufutur
e59725326a Fixed relative URL computation in wIthoutBaseUrl (#1785)
* Fixed relative URL computation in wIthoutBaseUrl

Current behaviour :
* base URL = http://foo.bar
* url = http://foo.bar/my/api
gives => my/api

Fixed behaviour : 
* base URL = http://foo.bar
* url = http://foo.bar/my/api
gives => /my/api

* Fixed & Added urlPathMatching related tests

Fixed false positive test getWithUrlPathMatching() (now fails without commit f9c9527f89e36ba5b4f5b00fc5895c8df78062e2 and pass after), and added 2 tests to ensure leading slash in urlPathPattern or trailing slash in base URL works fine.

Co-authored-by: Rudy Nappee <rudy.nappee@externe.maif.fr>
2022-05-18 09:37:58 +02:00
Marcin Grzejszczak
6fd4280d12 Removed deprecations 2021-11-16 22:59:15 +01:00
Marcin Grzejszczak
73e0de8290 Updated wiremock to 2.31.0; fixes gh-1715 2021-09-07 14:44:49 +02:00
GodwinMaravai
fab8b99b3a #1633 - Random https port in annotation AutoConfigureWireMock is broken issue - fix (#1653)
Co-authored-by: Godwin Ruswelt Xavier <godwin.ruswelt@kbc.be>
2021-04-29 14:33:41 +02:00
buildmaster
c323e3e105 Bumping versions 2021-04-24 00:21:43 +00:00
akotynski
006768c1e5 Support for jsonBody and base64Body Fixes gh-1644 (#1645) 2021-04-22 10:04:23 +02:00
spencergibb
f141261c15 Revert "Comment out milestone versions and related tests."
This reverts commit 8a5b8975
2021-03-18 11:58:32 -04:00
spencergibb
8a5b89753d Comment out milestone versions and related tests.
See gh-1625
2021-03-17 15:09:29 -04:00
buildmaster
d062b72805 Bumping versions 2021-02-19 00:20:52 +00:00
bono007
a69b207c88 Searches enclosing class for @AutoConfigureWiremock (#1611)
* Searches enclosing class for @AutoConfigureWiremock

* Replace MergedAnnotations.from with TestContextAnnotationUtils.findMergedAnnotation

* Use TestContextAnnotationUtils.hasAnnotation rather than 'find and is not null'

* Previous commit needs negation on "hasAnnotation"

Fixes gh-1610
2021-02-18 13:40:12 +01:00
Olga Maciaszek-Sharma
28bd1f47d7 Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	samples/standalone/restdocs/http-server/build.gradle
#	tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java
2021-01-22 10:25:46 +01:00
Sudhir Tumati
e3d0de106b Add javadoc for AutoConfigureWireMock (#1584) 2020-12-15 08:19:05 +01:00
Marcin Grzejszczak
1c1fb6f23a Makes in progress contract tests disabled
without this change all tests from a package were not generated if at least one was in progress
with this change all tests are generated but those in progress are disabled / ignored

fixes gh-1449
2020-12-10 13:02:58 +01:00
buildmaster
dbfcc50fae Bumping versions 2020-12-10 00:20:03 +00:00
Marcin Grzejszczak
0bb87d592e Merge branch '2.2.x' 2020-12-09 11:02:31 +01:00
Marcin Grzejszczak
3ccee094c4 Polish 2020-12-09 11:01:27 +01:00
Marcin Grzejszczak
9f78dad62d Merge branch '2.2.x' 2020-12-09 10:53:08 +01:00
Marcin Grzejszczak
4b7234d73c Revert "Revert "Support auto configuration on meta-annotations (#1564)""
This reverts commit c5b12b91b5.
2020-12-09 09:30:45 +01:00
Marcin Grzejszczak
a0c3686292 Setting current static WireMock instance when server is already running
without this change when the server was already running we wouldn't set the static WireMock's instance to that running server. That would result in still pointing to a previously started WireMock instance
with this change we're setting the static server instance to the running server

fixes gh-1425
2020-12-09 09:29:29 +01:00
Marcin Grzejszczak
c46118139f Fixed checkstyle 2020-12-08 16:08:49 +01:00
Marcin Grzejszczak
c05e2d4dfb Fixed checkstyle 2020-12-08 14:15:11 +01:00
Marcin Grzejszczak
bfbfe89351 Added better logging messages for WireMock configuration 2020-12-08 14:12:27 +01:00
buildmaster
1deb643be5 Bumping versions 2020-11-25 00:19:54 +00:00
Marcin Grzejszczak
93d22a834c Revert "Support auto configuration on meta-annotations (#1563)"
This reverts commit 663b76c742.
2020-11-24 08:43:20 +01:00
Marcin Grzejszczak
c5b12b91b5 Revert "Support auto configuration on meta-annotations (#1564)"
This reverts commit e3646988fe.
2020-11-24 08:33:04 +01:00
Fabian Winter
e3646988fe Support auto configuration on meta-annotations (#1564)
With this change, the stubbing of WireMock will be reset even if only a
meta-annotation is annotated with `@AutoConfigureWireMock`.

Fixes gh-1204
2020-11-23 10:27:56 +01:00
Marcin Grzejszczak
f620912740 Merge remote-tracking branch 'origin/2.2.x' 2020-11-23 09:31:50 +01:00
bono007
67eb9560a3 Allows @AutoConfigureWireMock to respect user-specified properties in yml (#1566)
Fixes gh-1555
2020-11-23 09:27:50 +01:00
Fabian Winter
663b76c742 Support auto configuration on meta-annotations (#1563)
With this change, the stubbing of WireMock will be reset even if only a
meta-annotation is annotated with `@AutoConfigureWireMock`.

Fixes gh-1204
2020-11-20 16:45:47 +01:00
buildmaster
ffd6574532 Bumping versions 2020-09-17 00:23:53 +00:00
Lari Hotari
c27e675ba8 Support multiple WireMockConfigurationCustomizers (#1501)
- fixes #1500
2020-09-08 13:24:30 +02:00
Marcin Grzejszczak
19f8cc4003 Fixed compilation issues 2020-07-07 18:20:33 +02:00
Marcin Grzejszczak
a37b35800d Fixed compilation issues 2020-07-07 08:52:13 +02:00
Olga Maciaszek-Sharma
6ec5c8440e Merge remote-tracking branch 'origin/2.2.x' 2020-05-08 18:52:04 +02:00
Olga Maciaszek-Sharma
ca90c521b3 Do not override default RestDocs snippets with RestAssured. Fixes gh-14.00. 2020-05-08 18:33:18 +02:00
Olga Maciaszek-Sharma
156657c8c4 Update license comments. 2020-04-27 15:38:44 +02:00
Olga Maciaszek-Sharma
90c4312b37 Update license comments. 2020-04-24 13:24:33 +02:00
Marcin Grzejszczak
1d923ee0a1 Fixed javadocs 2020-03-30 16:16:26 +02:00