account/activate: unbreak activation with empty name.

Broken since 00abf94 commit where I allow
transformation from empty string to null for field with name.

NOTE: I removed @CacheLookup annotation for body element to prevent
StaleElementReferenceException when we moved from current page and trying to
get text at another page.

Author: php-coder

src/env/test/WEB-INF/classes/spring/test-credentials.properties

@@ -17,6 +17,7 @@ invalid_user_password = test
 
 # this user should be just registered but not activated
 not_activated_user_act_key = 7777744444
+not_activated_user2_act_key = 4444477777
 
 # this country should always exist
 valid_country_name = Italy

src/env/test/WEB-INF/classes/test-data.sql

@@ -19,6 +19,13 @@ VALUES(
 	NOW()
 );
 
+INSERT INTO users_activation(act_key, email, created_at)
+VALUES(
+	'@not_activated_user2_act_key@',
+	'test2@example.org',
+	NOW()
+);
+
 INSERT INTO countries(name, created_at)
 VALUES(
 	'@valid_country_name@',

src/main/java/ru/mystamps/web/service/UserService.java

@@ -33,6 +33,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Strings.isNullOrEmpty;
 
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.entity.UsersActivation;
@@ -77,12 +78,11 @@ public void registerUser(final String login, final String password,
 
 		checkArgument(login != null, "Login should be non null");
 		checkArgument(password != null, "Password should be non null");
-		checkArgument(name != null, "Name should be non null");
 		checkArgument(activationKey != null, "Activation key should be non null");
 
 		// use login as name if name is not provided
 		final String finalName;
-		if ("".equals(name)) {
+		if (isNullOrEmpty(name)) {
 			finalName = login;
 		} else {
 			finalName = name;

src/test/java/ru/mystamps/web/service/UserServiceTest.java

@@ -200,11 +200,6 @@ public void registerUserShouldDoNothingWhenRegistrationRequestNotFound() {
 		verify(usersActivationDao, never()).delete(any(UsersActivation.class));
 	}
 
-	@Test(expectedExceptions = IllegalArgumentException.class)
-	public void registerUserShouldThrowExceptionWhenNameIsNull() {
-		service.registerUser(TEST_LOGIN, TEST_PASSWORD, null, TEST_ACTIVATION_KEY);
-	}
-	
 	@Test
 	public void registerUserShouldPassNameToDao() {
 		when(usersActivationDao.findByActivationKey(anyString())).thenReturn(getUsersActivation());
@@ -216,6 +211,17 @@ public void registerUserShouldPassNameToDao() {
 		assertThat(userCaptor.getValue().getName()).isEqualTo(TEST_NAME);
 	}
 
+	@Test
+	public void registerUserShouldPassLoginInsteadOfNameWhenNameIsNull() {
+		when(usersActivationDao.findByActivationKey(anyString())).thenReturn(getUsersActivation());
+		
+		service.registerUser(TEST_LOGIN, TEST_PASSWORD, null, TEST_ACTIVATION_KEY);
+		
+		verify(userDao).save(userCaptor.capture());
+		
+		assertThat(userCaptor.getValue().getName()).isEqualTo(TEST_LOGIN);
+	}
+	
 	@Test
 	public void registerUserShouldPassLoginInsteadOfNameWhenNameIsEmpty() {
 		when(usersActivationDao.findByActivationKey(anyString())).thenReturn(getUsersActivation());

src/test/java/ru/mystamps/web/tests/cases/WhenUserActivateAccount.java

@@ -51,6 +51,9 @@ public class WhenUserActivateAccount extends WhenUserAtAnyPageWithForm<ActivateA
 	@Value("#{test.not_activated_user_act_key}")
 	private String notActivatedUserActKey;
 
+	@Value("#{test.not_activated_user2_act_key}")
+	private String secondNotActivatedUserActKey;
+	
 	public WhenUserActivateAccount() {
 		super(ActivateAccountPage.class);
 		hasTitle(tr("t_activation_title"));
@@ -293,6 +296,23 @@ public void afterActivationShouldExistsMessageWithLinkForAuthentication() {
 			.isTrue();
 	}
 
+	@Test(groups = "logic", dependsOnGroups = {
+		"std", "invalid", "valid", "misc"
+	})
+	public void activationShouldPassWhenUserProvidedEmptyName() {
+		page.activateAccount(
+			"2nd-test-login",
+			"",
+			"test-password",
+			"test-password",
+			secondNotActivatedUserActKey
+		);
+		
+		assertThat(page.getCurrentUrl()).isEqualTo(SUCCESSFUL_ACTIVATION_PAGE_URL);
+		
+		assertThat(page.textPresent(stripHtmlTags(tr("t_activation_successful")))).isTrue();
+	}
+	
 	@DataProvider(name = "validNames")
 	public Object[][] getValidNames() {
 		return new Object[][] {

src/test/java/ru/mystamps/web/tests/page/AbstractPage.java

@@ -27,7 +27,6 @@
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.CacheLookup;
 import org.openqa.selenium.support.FindBy;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -49,7 +48,6 @@ public abstract class AbstractPage {
 	private final String pageUrl;
 
 	@FindBy(tagName = "body")
-	@CacheLookup
 	private WebElement body;
 
 	public void open() {