Skip to content

Commit 2d42222

Browse files
OlehStefanyshynOlehStefanyshyn
authored
Merge pull request #1663 from atlassian/jsm/confluence/bump-versions
jsm/confluence/bump-versions
2 parents c90d688 + 8eb2c84 commit 2d42222

File tree

12 files changed

+504
-113
lines changed

12 files changed

+504
-113
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
88
* Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.17` and `10.3.0`
99

1010
* Supported Jira Service Management versions:
11-
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12` and `10.3.1`
11+
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.17` and `10.3.1`
1212

1313
* Supported Confluence versions:
14-
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14` and `9.2.0`
14+
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.0`
1515

1616
* Supported Bitbucket Server versions:
1717
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.14` and `9.4.1`

‎app/jmeter/jsm_agents.jmx

Lines changed: 195 additions & 45 deletions
Large diffs are not rendered by default.

‎app/jmeter/jsm_customers.jmx

Lines changed: 146 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -249,33 +249,18 @@ import org.apache.commons.io.FileUtils;
249249
<boolProp name="TransactionController.includeTimers">false</boolProp>
250250
</TransactionController>
251251
<hashTree>
252-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="100 /servicedesk/customer/user/login" enabled="true">
253-
<stringProp name="HTTPSampler.path">${application.postfix}/servicedesk/customer/user/login</stringProp>
252+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="100 /servicedesk/customer/user/login">
253+
<stringProp name="HTTPSampler.path">${application.postfix}/login.jsp</stringProp>
254254
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
255-
<stringProp name="HTTPSampler.method">POST</stringProp>
255+
<stringProp name="HTTPSampler.method">GET</stringProp>
256256
<boolProp name="HTTPSampler.use_keepalive">true</boolProp>
257257
<boolProp name="HTTPSampler.postBodyRaw">false</boolProp>
258258
<elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables">
259-
<collectionProp name="Arguments.arguments">
260-
<elementProp name="os_password" elementType="HTTPArgument">
261-
<boolProp name="HTTPArgument.always_encode">true</boolProp>
262-
<stringProp name="Argument.name">os_password</stringProp>
263-
<stringProp name="Argument.value">${password}</stringProp>
264-
<stringProp name="Argument.metadata">=</stringProp>
265-
<boolProp name="HTTPArgument.use_equals">true</boolProp>
266-
</elementProp>
267-
<elementProp name="os_username" elementType="HTTPArgument">
268-
<boolProp name="HTTPArgument.always_encode">true</boolProp>
269-
<stringProp name="Argument.name">os_username</stringProp>
270-
<stringProp name="Argument.value">${username}</stringProp>
271-
<stringProp name="Argument.metadata">=</stringProp>
272-
<boolProp name="HTTPArgument.use_equals">true</boolProp>
273-
</elementProp>
274-
</collectionProp>
259+
<collectionProp name="Arguments.arguments"/>
275260
</elementProp>
276261
</HTTPSamplerProxy>
277262
<hashTree>
278-
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header manager">
263+
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header manager" enabled="true">
279264
<collectionProp name="HeaderManager.headers">
280265
<elementProp name="Accept" elementType="Header">
281266
<stringProp name="Header.name">Accept</stringProp>
@@ -296,6 +281,147 @@ import org.apache.commons.io.FileUtils;
296281
</collectionProp>
297282
</HeaderManager>
298283
<hashTree/>
284+
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="legacy login form check" enabled="true">
285+
<stringProp name="RegexExtractor.useHeaders">false</stringProp>
286+
<stringProp name="RegexExtractor.refname">legacy_form</stringProp>
287+
<stringProp name="RegexExtractor.regex">login-form-remember-me</stringProp>
288+
<stringProp name="RegexExtractor.template">$1$</stringProp>
289+
<stringProp name="RegexExtractor.default">NOT_FOUND</stringProp>
290+
<stringProp name="RegexExtractor.match_number">1</stringProp>
291+
<stringProp name="Sample.scope">all</stringProp>
292+
<stringProp name="Scope.variable"></stringProp>
293+
<boolProp name="RegexExtractor.default_empty_value">false</boolProp>
294+
</RegexExtractor>
295+
<hashTree/>
296+
<JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="set legacy form type" enabled="true">
297+
<stringProp name="scriptLanguage">groovy</stringProp>
298+
<stringProp name="parameters"></stringProp>
299+
<stringProp name="filename"></stringProp>
300+
<stringProp name="cacheKey">true</stringProp>
301+
<stringProp name="script">String loginform = vars.get(&quot;legacy_form&quot;);
302+
303+
if (&quot;NOT_FOUND&quot;.equals(loginform)) {
304+
vars.put(&quot;legacy_login_form&quot;, &quot;false&quot;);
305+
log.info(&quot;2sv flow detected&quot;);
306+
} else {
307+
vars.put(&quot;legacy_login_form&quot;, &quot;true&quot;);
308+
log.info(&quot;Legacy login flow detected&quot;);
309+
}
310+
</stringProp>
311+
</JSR223PostProcessor>
312+
<hashTree/>
313+
<JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Logger" enabled="true">
314+
<stringProp name="scriptLanguage">groovy</stringProp>
315+
<stringProp name="parameters"></stringProp>
316+
<stringProp name="filename"></stringProp>
317+
<stringProp name="cacheKey">true</stringProp>
318+
<stringProp name="script">log.info(&quot;Legacy login flow: ${legacy_login_form}&quot;)
319+
</stringProp>
320+
</JSR223PostProcessor>
321+
<hashTree/>
322+
</hashTree>
323+
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="If legacy login flow" enabled="true">
324+
<stringProp name="IfController.condition">${__groovy(vars.get(&quot;legacy_login_form&quot;) == &apos;true&apos;)}</stringProp>
325+
<boolProp name="IfController.evaluateAll">false</boolProp>
326+
<boolProp name="IfController.useExpression">true</boolProp>
327+
</IfController>
328+
<hashTree>
329+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="100 /servicedesk/customer/user/login" enabled="true">
330+
<stringProp name="HTTPSampler.path">${application.postfix}/servicedesk/customer/user/login</stringProp>
331+
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
332+
<stringProp name="HTTPSampler.method">POST</stringProp>
333+
<boolProp name="HTTPSampler.use_keepalive">true</boolProp>
334+
<boolProp name="HTTPSampler.postBodyRaw">false</boolProp>
335+
<elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables">
336+
<collectionProp name="Arguments.arguments">
337+
<elementProp name="os_password" elementType="HTTPArgument">
338+
<boolProp name="HTTPArgument.always_encode">true</boolProp>
339+
<stringProp name="Argument.name">os_password</stringProp>
340+
<stringProp name="Argument.value">${password}</stringProp>
341+
<stringProp name="Argument.metadata">=</stringProp>
342+
<boolProp name="HTTPArgument.use_equals">true</boolProp>
343+
</elementProp>
344+
<elementProp name="os_username" elementType="HTTPArgument">
345+
<boolProp name="HTTPArgument.always_encode">true</boolProp>
346+
<stringProp name="Argument.name">os_username</stringProp>
347+
<stringProp name="Argument.value">${username}</stringProp>
348+
<stringProp name="Argument.metadata">=</stringProp>
349+
<boolProp name="HTTPArgument.use_equals">true</boolProp>
350+
</elementProp>
351+
</collectionProp>
352+
</elementProp>
353+
</HTTPSamplerProxy>
354+
<hashTree>
355+
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header manager" enabled="true">
356+
<collectionProp name="HeaderManager.headers">
357+
<elementProp name="Accept" elementType="Header">
358+
<stringProp name="Header.name">Accept</stringProp>
359+
<stringProp name="Header.value">*/*</stringProp>
360+
</elementProp>
361+
<elementProp name="X-Requested-With" elementType="Header">
362+
<stringProp name="Header.name">X-Requested-With</stringProp>
363+
<stringProp name="Header.value">XMLHttpRequest</stringProp>
364+
</elementProp>
365+
<elementProp name="Content-Type" elementType="Header">
366+
<stringProp name="Header.name">Content-Type</stringProp>
367+
<stringProp name="Header.value">application/x-www-form-urlencoded</stringProp>
368+
</elementProp>
369+
<elementProp name="" elementType="Header">
370+
<stringProp name="Header.name">X-Atlassian-Token</stringProp>
371+
<stringProp name="Header.value">no-check</stringProp>
372+
</elementProp>
373+
</collectionProp>
374+
</HeaderManager>
375+
<hashTree/>
376+
</hashTree>
377+
</hashTree>
378+
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="if 2sv login flow" enabled="true">
379+
<stringProp name="IfController.condition">${__groovy(vars.get(&quot;legacy_login_form&quot;) == &apos;false&apos;)}</stringProp>
380+
<boolProp name="IfController.evaluateAll">false</boolProp>
381+
<boolProp name="IfController.useExpression">true</boolProp>
382+
</IfController>
383+
<hashTree>
384+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="15 /rest/tsv/1.0/authenticate" enabled="true">
385+
<stringProp name="TestPlan.comments">2sv login flow</stringProp>
386+
<stringProp name="HTTPSampler.path">${application.postfix}/rest/tsv/1.0/authenticate</stringProp>
387+
<stringProp name="HTTPSampler.method">POST</stringProp>
388+
<boolProp name="HTTPSampler.use_keepalive">true</boolProp>
389+
<boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
390+
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
391+
<collectionProp name="Arguments.arguments">
392+
<elementProp name="" elementType="HTTPArgument">
393+
<boolProp name="HTTPArgument.always_encode">false</boolProp>
394+
<stringProp name="Argument.value">{&quot;username&quot;: &quot;${username}&quot;,&#xd;
395+
&quot;password&quot;: &quot;${password}&quot;,&#xd;
396+
&quot;rememberMe&quot;: &quot;True&quot;,&#xd;
397+
&quot;targetUrl&quot;: &quot;&quot;&#xd;
398+
}</stringProp>
399+
<stringProp name="Argument.metadata">=</stringProp>
400+
</elementProp>
401+
</collectionProp>
402+
</elementProp>
403+
</HTTPSamplerProxy>
404+
<hashTree>
405+
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
406+
<collectionProp name="HeaderManager.headers">
407+
<elementProp name="Content-Type" elementType="Header">
408+
<stringProp name="Header.name">Content-Type</stringProp>
409+
<stringProp name="Header.value">application/json</stringProp>
410+
</elementProp>
411+
</collectionProp>
412+
</HeaderManager>
413+
<hashTree/>
414+
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
415+
<collectionProp name="Asserion.test_strings">
416+
<stringProp name="49586">200</stringProp>
417+
</collectionProp>
418+
<stringProp name="Assertion.custom_message"></stringProp>
419+
<stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
420+
<boolProp name="Assertion.assume_success">false</boolProp>
421+
<intProp name="Assertion.test_type">2</intProp>
422+
</ResponseAssertion>
423+
<hashTree/>
424+
</hashTree>
299425
</hashTree>
300426
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="105 /servicedesk/customer/portals" enabled="true">
301427
<stringProp name="HTTPSampler.path">${application.postfix}/servicedesk/customer/portals</stringProp>

‎app/locustio/jsm/agents/agents_http_actions.py

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,35 @@ def agent_login_and_view_dashboard(locust, jsm_agent_dataset):
5151
body['os_username'] = user[0]
5252
body['os_password'] = user[1]
5353

54-
locust.post('/login.jsp', body, TEXT_HEADERS, catch_response=True)
54+
legacy_form = False
55+
56+
# is 2sv login form
57+
r = locust.get('/login.jsp', catch_response=True)
58+
if b'login-form-remember-me' in r.content:
59+
legacy_form = True
60+
61+
if legacy_form:
62+
locust.post('/login.jsp', body, TEXT_HEADERS, catch_response=True)
63+
logger.locust_info(f"Legacy login flow for user {user[0]}")
64+
else:
65+
logger.locust_info(f"2SV login flow for user {user[0]}")
66+
67+
login_body = {'username': user[0],
68+
'password': user[1],
69+
'rememberMe': 'True',
70+
'targetUrl': ''
71+
}
72+
73+
headers = {
74+
"Content-Type": "application/json"
75+
}
76+
77+
# 15 /rest/tsv/1.0/authenticate
78+
locust.post('/rest/tsv/1.0/authenticate',
79+
json=login_body,
80+
headers=headers,
81+
catch_response=True)
82+
5583
r = locust.get('/', catch_response=True)
5684
if not r.content:
5785
raise Exception('Please check server hostname in jsm.yml file')

‎app/locustio/jsm/customers/customers_http_actions.py

Lines changed: 52 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,61 @@ def customer_login_and_view_portals(locust):
4747
locust.session_data_storage['username'] = user[0]
4848
locust.session_data_storage['password'] = user[1]
4949

50-
r = locust.post(
51-
'/servicedesk/customer/user/login',
52-
body,
53-
headers=JSM_CUSTOMERS_HEADERS,
54-
catch_response=True)
50+
legacy_form = False
5551

56-
locust.get('/servicedesk/customer/portals', catch_response=True)
52+
# is 2sv login form
53+
r = locust.get('/login.jsp', catch_response=True)
54+
if b'login-form-remember-me' in r.content:
55+
legacy_form = True
5756

58-
locust.post(
59-
'/rest/servicedesk/1/customer/models',
60-
json=params.resources_body.get("115"),
61-
headers=RESOURCE_HEADERS,
62-
catch_response=True)
57+
if legacy_form:
58+
r = locust.post(
59+
'/servicedesk/customer/user/login',
60+
body,
61+
headers=JSM_CUSTOMERS_HEADERS,
62+
catch_response=True)
63+
64+
locust.get('/servicedesk/customer/portals', catch_response=True)
65+
66+
locust.post(
67+
'/rest/servicedesk/1/customer/models',
68+
json=params.resources_body.get("115"),
69+
headers=RESOURCE_HEADERS,
70+
catch_response=True)
71+
72+
assert '"loginSucceeded":true' in r.content.decode('utf-8'), 'Customer login is failed'
73+
74+
else:
75+
logger.locust_info(f"2SV login flow for user {user[0]}")
76+
77+
login_body = {'username': user[0],
78+
'password': user[1],
79+
'rememberMe': 'True',
80+
'targetUrl': ''
81+
}
82+
83+
headers = {
84+
"Content-Type": "application/json",
85+
"Accept": "*/*"
86+
}
87+
88+
locust.post('/rest/tsv/1.0/authenticate?os_authType=none',
89+
json=login_body,
90+
headers=headers,
91+
catch_response=True)
92+
93+
locust.get('/servicedesk/customer/portals', catch_response=True)
94+
95+
locust.post(
96+
'/rest/servicedesk/1/customer/models',
97+
json=params.resources_body.get("115"),
98+
headers=RESOURCE_HEADERS,
99+
catch_response=True)
63100

64-
assert '"loginSucceeded":true' in r.content.decode(
65-
'utf-8'), 'Customer login is failed'
101+
r = locust.get('/', catch_response=True)
102+
if not r.content:
103+
raise Exception('Please check server hostname in jsm.yml file')
104+
r.content.decode('utf-8')
66105

67106

68107
@jsm_customer_measure('locust_customer_view_portal')

‎app/selenium_ui/jsm/modules_agents.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def measure():
9292
@print_timing("selenium_agent_login:open_login_page")
9393
def sub_measure():
9494
login_page.go_to()
95+
login_page.is_2sv()
9596
sub_measure()
9697

9798
@print_timing("selenium_agent_login:login_and_view_dashboard")

‎app/selenium_ui/jsm/modules_customers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ def measure():
7070
@print_timing("selenium_customer_login:open_login_page")
7171
def sub_measure():
7272
login_page.go_to()
73+
login_page.is_2sv()
7374
webdriver.app_version = login_page.get_app_version()
7475
if login_page.is_logged_in():
7576
login_page.delete_all_cookies()
7677
login_page.go_to()
77-
login_page.wait_for_page_loaded()
7878
sub_measure()
7979

8080
@print_timing("selenium_customer_login:login_and_view_portal")

‎app/selenium_ui/jsm/pages/agent_pages.py

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,18 @@ class Login(BasePage):
1919
base_url = UrlManager().host
2020
page_loaded_selector = LoginPageLocators.system_dashboard
2121

22+
def __init__(self, driver):
23+
super().__init__(driver)
24+
self.is_2sv_login = False
25+
2226
def is_first_login(self):
2327
return True if self.get_elements(LoginPageLocators.continue_button) else False
2428

29+
def is_2sv(self):
30+
if not self.get_elements(LoginPageLocators.login_submit_button):
31+
self.is_2sv_login = True
32+
print("INFO: 2sv login form")
33+
2534
def is_first_login_second_page(self):
2635
return True if self.get_elements(LoginPageLocators.avatar_page_next_button) else False
2736

@@ -37,9 +46,21 @@ def first_login_second_page_setup(self):
3746
self.wait_until_visible(DashboardLocators.dashboard_window)
3847

3948
def set_credentials(self, username, password):
40-
self.get_element(LoginPageLocators.login_field).send_keys(username)
41-
self.get_element(LoginPageLocators.password_field).send_keys(password)
42-
self.get_element(LoginPageLocators.login_submit_button).click()
49+
login_field = LoginPageLocators.login_field
50+
password_field = LoginPageLocators.password_field
51+
submit_button = LoginPageLocators.login_submit_button
52+
if self.is_2sv_login:
53+
login_field = LoginPageLocators.login_field_2sv
54+
password_field = LoginPageLocators.password_field_2sv
55+
submit_button = LoginPageLocators.login_submit_button_2sv
56+
57+
self.wait_until_visible(login_field).send_keys(username)
58+
self.wait_until_visible(password_field).send_keys(password)
59+
self.wait_until_visible(submit_button).click()
60+
61+
def wait_for_dashboard_or_first_login_loaded(self):
62+
self.wait_until_any_ec_presented((LoginPageLocators.system_dashboard,
63+
LoginPageLocators.continue_button))
4364

4465
def __get_footer_text(self):
4566
return self.get_element(LoginPageLocators.footer).text

0 commit comments

Comments
 (0)