Skip to content

Commit eb6329e

Browse files
committed
WhenAnonymousUserActivateAccount.afterActivationShouldExistsMessageWithLinkForAuthentication(): port to Robot Framework.
Addressed to #530 No functional changes.
1 parent 3c9a96e commit eb6329e

File tree

4 files changed

+35
-20
lines changed

4 files changed

+35
-20
lines changed

src/main/resources/test/spring/test-data.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ invalid_user_login = test
1616
invalid_user_password = test
1717

1818
# these users should be just registered but not activated
19-
# (used only in WhenAnonymousUserActivateAccount)
19+
# (used only in WhenAnonymousUserActivateAccount and src/test/robotframework/account/activation/logic.robot)
2020
not_activated_user1_act_key = 7777744444
2121
not_activated_user2_act_key = 4444477777
2222

src/main/webapp/WEB-INF/views/account/auth.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ <h3 th:text="#{t_authentication_on_site}">
8585

8686
<!--/*/
8787
<div class="row" th:if="${justActivatedUser}">
88-
<div class="alert alert-success text-center col-sm-10 col-sm-offset-1" th:text="#{t_activation_successful}">
88+
<div id=msg-success class="alert alert-success text-center col-sm-10 col-sm-offset-1" th:text="#{t_activation_successful}">
8989
Account successfully activated! Now you can pass authentication.
9090
</div>
9191
</div>

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

-18
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ public class WhenAnonymousUserActivateAccount
4646
@Value("${valid_user_login}")
4747
private String validUserLogin;
4848

49-
@Value("${not_activated_user1_act_key}")
50-
private String firstNotActivatedUserActKey;
51-
5249
@Value("${not_activated_user2_act_key}")
5350
private String secondNotActivatedUserActKey;
5451

@@ -283,21 +280,6 @@ public void wrongActivationKeyShouldBeRejected() {
283280
.hasError(tr("ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message"));
284281
}
285282

286-
@Test(groups = "logic", dependsOnGroups = { "std", "invalid", "valid", "misc" })
287-
public void afterActivationShouldExistsMessageWithLinkForAuthentication() {
288-
page.activateAccount(
289-
"1st-test-login",
290-
"Test Suite",
291-
"test-password",
292-
"test-password",
293-
firstNotActivatedUserActKey
294-
);
295-
296-
assertThat(page.getCurrentUrl()).isEqualTo(Url.AUTHENTICATION_PAGE);
297-
298-
assertThat(page.textPresent(stripHtmlTags(tr("t_activation_successful")))).isTrue();
299-
}
300-
301283
@Test(groups = "logic", dependsOnGroups = { "std", "invalid", "valid", "misc" })
302284
public void activationShouldPassWhenUserProvidedEmptyName() {
303285
page.activateAccount(
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
*** Settings ***
2+
Documentation Verify account activation scenarios
3+
Library Selenium2Library
4+
Suite Setup Before Test Suite
5+
Suite Teardown After Test Suite
6+
Test Setup Before Test
7+
Force Tags account activation logic
8+
9+
*** Test Cases ***
10+
Activate account with full info
11+
[Documentation] Verify account activation by filling all fields
12+
Input Text id=login 1st-test-login
13+
Input Text id=name Test Suite
14+
Input Text id=password test-password
15+
Input Text id=passwordConfirmation test-password
16+
Input Text id=activationKey 7777744444
17+
Submit Form id=activate-account-form
18+
Location Should Be ${SITE_URL}/account/auth
19+
Element Text Should Be id=msg-success Account successfully activated! Now you can pass authentication.
20+
21+
*** Keywords ***
22+
Before Test Suite
23+
[Documentation] Open browser and register fail hook
24+
Open Browser ${SITE_URL} ${BROWSER}
25+
Register Keyword To Run On Failure Log Source
26+
27+
Before Test
28+
[Documentation] Open activate account page
29+
Go To ${SITE_URL}/account/activate
30+
31+
After Test Suite
32+
[Documentation] Close browser
33+
Close Browser

0 commit comments

Comments
 (0)