Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Step's attachments should be shown after sub-steps #420

Merged
merged 3 commits into from
Jun 27, 2017
Merged

Step's attachments should be shown after sub-steps #420

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aef3287
attachments should be shown after steps
leonsabr Jun 20, 2017
90e51d0
Merge branch 'master' into attachments-after-steps
baev Jun 26, 2017
fe0c97c
Merge branch 'master' into attachments-after-steps
baev Jun 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion allure-generator/src/main/javascript/components/execution/steps-list.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
{{/each}}
</div>
{{/if}}
{{> steps-list steps=steps baseUrl=../baseUrl}}
{{#each attachments}}
{{> ../../blocks/attachment-row/attachment-row . baseUrl=../../baseUrl}}
{{/each}}
{{> steps-list steps=steps baseUrl=../baseUrl}}
</div>
</div>
{{/each}}
62 changes: 62 additions & 0 deletions allure-generator/test-data/demo/64c6873a-5073-47ba-bd87-016ec3d7f2b4-testsuite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<ns2:test-suite start="1497964039940" stop="1497964062424" version="1.4.23" xmlns:ns2="urn:model.allure.qatools.yandex.ru">
<name>my.company.CustomWidgetPageTest</name>
<title>Custom Widget page</title>
<test-cases>
<test-case start="1497964039950" stop="1497964051895" status="passed">
<name>open widget page</name>
<steps>
<step start="1497964044638" stop="1497964045140" status="passed">
<name>toLoginForm</name>
<title>Open Login form</title>
<attachments/>
<steps/>
</step>
<step start="1497964045143" stop="1497964047173" status="passed">
<name>login[admin, admin]</name>
<title>Log in as admin/admin</title>
<attachments/>
<steps/>
</step>
<step start="1497964049713" stop="1497964051574" status="passed">
<name>uploadWidgetArchive[tests/web-tests/build/resources/test/widgets/test-widget.zip]</name>
<title>Upload widget</title>
<attachments>
<attachment title="WidgetPage" source="2a61ec3c-1149-47cc-8640-615e51af26f5-attachment.png" type="image/png"/>
</attachments>
<steps>
<step start="1497964049868" stop="1497964050998" status="passed">
<name>selectFile[tests/web-tests/build/resources/test/widgets/test-widget.zip]</name>
<title>Select widget archive [tests/web-tests/build/resources/test/widgets/test-widget.zip]</title>
<attachments>
<attachment title="Import widget dialog" source="8e86c8ae-c2cd-49d4-a1b8-87592aa6de02-attachment.png" type="image/png"/>
</attachments>
<steps/>
</step>
<step start="1497964050998" stop="1497964051000" status="passed">
<name>step</name>
<title>step</title>
<attachments/>
<steps/>
</step>
</steps>
</step>
<step start="1497964051575" stop="1497964051816" status="passed">
<name>verifyWidget[test-widget, Test widget, 0.0.1]</name>
<title>Verify widget description [test-widget/Test widget/0.0.1]</title>
<attachments/>
<steps/>
</step>
</steps>
<attachments/>
<labels>
<label name="host" value="testing.company.net"/>
<label name="thread" value="32653@testing.company.net.Test worker(11)"/>
</labels>
</test-case>
</test-cases>
<labels>
<label name="framework" value="JUnit"/>
<label name="language" value="JAVA"/>
</labels>
</ns2:test-suite>