1. 22 Feb, 2017 11 commits
  2. 21 Feb, 2017 1 commit
    • Andy Wilkinson's avatar
      Use name from @SpyBean to disambiguate multiple candidates · 70e802fb
      Andy Wilkinson authored
      Previously, @SpyBean's name attribute was not used when determining
      the name of the bean to spy upon. When there were multiple candidates,
      none of which were primary, this would lead to a failure to find the
      bean to spy upon. This behaviour is also inconsistent with @MockBean
      which does use the name attribute to identify the bean to mock.
      
      This commit updates MockitoPostProcessor to use the name attribute,
      when set, to identify the bean that should be spied upon. For
      consistency with @MockBean it is always used when set. When not set
      the previous logic will continue to be used.
      
      Closes gh-8315
      70e802fb
  3. 20 Feb, 2017 1 commit
  4. 17 Feb, 2017 2 commits
  5. 15 Feb, 2017 3 commits
  6. 14 Feb, 2017 3 commits
  7. 13 Feb, 2017 2 commits
  8. 12 Feb, 2017 2 commits
  9. 08 Feb, 2017 8 commits
  10. 07 Feb, 2017 3 commits
  11. 05 Feb, 2017 3 commits
  12. 02 Feb, 2017 1 commit
    • Andy Wilkinson's avatar
      Apply root to URIs directly rather than relying on expansion · 2f50d515
      Andy Wilkinson authored
      Previously, TestRestTemplate applied the root URI to URIs by
      converting them to a String and then passing the String to the
      RestTemplate delegate. Being a String, meant that the URI passed
      through RestTemplate's standard URI template expansion processing
      using the configured UriTemplateHandler. While this caused the root
      URI to be applied, it also had the unwanted side-effect of
      encoding the URI for a second time.
      
      This commit updates TestRestTemplate so that, when configured with a
      RootUriTemplateHandler, it applies the root URI directly and then
      passes a modified URI to the RestTemplate delegate. Being a URI means
      that no template expansion is performed and the possible double
      encoding is avoided.
      
      Closes gh-8163
      2f50d515