Merge pull request #7491 from amit2103/BAEL-16045-19

[BAEL-16045] - Check Article Code Matches GitHub for https://www.bael…

spring-mockito/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.main.allow-bean-definition-overriding=true

spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java

@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile;
 public class NameServiceTestConfiguration {
     @Bean
     @Primary
-    public NameService nameServiceTest() {
+    public NameService nameService() {
         return Mockito.mock(NameService.class);
     }
 }