Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2017-01-04 09:56:19 +01:00
11 changed files with 14 additions and 14 deletions

View File

@@ -168,7 +168,7 @@ public class TestRestTemplateTests {
@Test
public void withBasicAuthReplacesBasicAuthInterceptorWhenAlreadyPresent() {
TestRestTemplate original = new TestRestTemplate("foo", "bar")
.withBasicAuth("replace", "repalce");
.withBasicAuth("replace", "replace");
TestRestTemplate basicAuth = original.withBasicAuth("user", "password");
assertThat(basicAuth.getRestTemplate().getMessageConverters())
.containsExactlyElementsOf(