Skip to content

Commit

Permalink
fix html attachments (fixes #496, via #505)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sseliverstov @baev
sseliverstov authored and baev committed Jul 31, 2017
1 parent 7861d5c commit d76f2e4
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 3 deletions.
2 changes: 2 additions & 0 deletions allure-generator/src/main/javascript/components/attachment/AttachmentView.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
</p>
{{/each}}
</div>
{{else if (eq type "html")}}
<iframe class="{{b 'attachment__iframe' fullscreen=fullScreen}}" frameborder="0" src="{{sourceUrl}}"></iframe>
{{else}}
<div class="{{b 'attachment__text-container' fullscreen=fullScreen}}">
<span class="fa fa-download"></span>
Expand Down
10 changes: 8 additions & 2 deletions allure-generator/src/main/javascript/components/attachment/styles.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
cursor: zoom-out;
}
}
&__iframe-container {
height: 100%;
}
&__embed, &__media {
max-width: 100%;
display: block;
Expand All @@ -61,6 +64,9 @@
}
&__iframe {
width: 100%;
flex: 1;
&_fullscreen {
background-color: $pane-bg-color;
height: 85vh;
}
}
}
}
28 changes: 28 additions & 0 deletions allure-generator/test-data/demo2/1c43e04d-e3eb-4039-a269-b6b1653ab539-attachment
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<html>
<body>
<h1>HTML</h1>
<h2>HTML</h2>
<h3>HTML</h3>
<h4>HTML</h4>
<h5>HTML</h5>
<h6>HTML</h6>
<h1>HTML</h1>
<h2>HTML</h2>
<h3>HTML</h3>
<h4>HTML</h4>
<h5>HTML</h5>
<h6>HTML</h6>
<h1>HTML</h1>
<h2>HTML</h2>
<h3>HTML</h3>
<h4>HTML</h4>
<h5>HTML</h5>
<h6>HTML</h6>
<h1>HTML</h1>
<h2>HTML</h2>
<h3>HTML</h3>
<h4>HTML</h4>
<h5>HTML</h5>
<h6>HTML</h6>
</body>
</html>
2 changes: 1 addition & 1 deletion allure-generator/test-data/demo2/ea754c30-4e5e-46d0-8cbc-0ce4502b5adc-result.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"uuid":"ea754c30-4e5e-46d0-8cbc-0ce4502b5adc","historyId":"629247865c8f93cbcc044dd2df16d5bc","fullName":"io.github.sskorol.testcases.common.CommonTests.shouldDisplayUserBalance","labels":[{"name":"package","value":"io.github.sskorol.testcases.common.CommonTests"},{"name":"testClass","value":"io.github.sskorol.testcases.common.CommonTests"},{"name":"testMethod","value":"shouldDisplayUserBalance"},{"name":"parentSuite","value":"Common suite"},{"name":"suite","value":"Allure tests"},{"name":"subSuite","value":"io.github.sskorol.testcases.common.CommonTests"},{"name":"host","value":"charlie.local"},{"name":"thread","value":"64433@charlie.local.Test worker(11)"},{"name":"feature","value":"Payments"},{"name":"story","value":"ALR-26"},{"name":"severity","value":"blocker"}],"links":[{"name":"27","url":"https://github.com/allure-framework/allure-docs/issues/27","type":"issue"},{"name":"25","url":"https://github.com/allure-framework/allure-docs/issues/25","type":"tms"}],"name":"shouldDisplayUserBalance","status":"passed","statusDetails":{"known":false,"muted":false,"flaky":false},"stage":"finished","start":1495892654569,"stop":1495892654575,"steps":[{"name":"Open LoginPage","status":"passed","stage":"finished","start":1495892654570,"stop":1495892654570,"parameters":[{"name":"name","value":"LoginPage"}]},{"name":"Log into web site.","status":"passed","stage":"finished","start":1495892654570,"stop":1495892654572,"steps":[{"name":"Type \"dummyUsername\" into \"Username\" input.","status":"passed","stage":"finished","start":1495892654570,"stop":1495892654571,"attachments":[{"name":"Log","source":"378164c5-e5b0-46d0-92e9-e98ae36ad748-attachment","type":"text/plain"}],"parameters":[{"name":"username","value":"dummyUsername"}]},{"name":"Type \"dummyPassword\" into \"Password\" input.","status":"passed","stage":"finished","start":1495892654571,"stop":1495892654571,"parameters":[{"name":"password","value":"dummyPassword"}]},{"name":"Click button \"Log On\"","status":"passed","stage":"finished","start":1495892654571,"stop":1495892654572,"steps":[{"name":"Open HomePage","status":"passed","stage":"finished","start":1495892654571,"stop":1495892654572,"parameters":[{"name":"name","value":"HomePage"}]}]}],"parameters":[{"name":"user","value":"User(username=dummyUsername, password=dummyPassword)"}]},{"name":"Display balance","status":"passed","stage":"finished","start":1495892654572,"stop":1495892654575,"attachments":[{"name":"Archive","source":"42ea0be1-b76d-4b04-8ce1-7c80fb7edea5-attachment","type":"application/gzip"},{"name":"Config","source":"6600af0b-9392-40ff-b7a0-c2878ea1a81f-attachment","type":"application/xml"},{"name":"Data","source":"43fa1d80-ba69-4aea-9eac-d92adb81c8bc-attachment","type":"application/json"},{"name":"Links","source":"af2ec9e5-99b6-4a7b-a432-372f149bbe23-attachment","type":"text/uri-list"},{"name":"Log","source":"2ffa6db1-d2e4-448d-ad93-3df677e51e4d-attachment","type":"text/plain"},{"name":"Table","source":"e696b7dc-de41-4601-b2d6-d7141b1e80c0-attachment","type":"text/csv"},{"name":"Video","source":"6ca42b2d-3a93-4e38-9e9b-9db963726644-attachment","type":"video/webm"}]}],"attachments":[{"name":"Test log","source":"db2c5aa0-7b68-4480-9e04-3444c78271a8-attachment","type":"text/plain"}],"parameters":[{"name":"arg0","value":"User(username=dummyUsername, password=dummyPassword)"}]}
{"uuid":"ea754c30-4e5e-46d0-8cbc-0ce4502b5adc","historyId":"629247865c8f93cbcc044dd2df16d5bc","fullName":"io.github.sskorol.testcases.common.CommonTests.shouldDisplayUserBalance","labels":[{"name":"package","value":"io.github.sskorol.testcases.common.CommonTests"},{"name":"testClass","value":"io.github.sskorol.testcases.common.CommonTests"},{"name":"testMethod","value":"shouldDisplayUserBalance"},{"name":"parentSuite","value":"Common suite"},{"name":"suite","value":"Allure tests"},{"name":"subSuite","value":"io.github.sskorol.testcases.common.CommonTests"},{"name":"host","value":"charlie.local"},{"name":"thread","value":"64433@charlie.local.Test worker(11)"},{"name":"feature","value":"Payments"},{"name":"story","value":"ALR-26"},{"name":"severity","value":"blocker"}],"links":[{"name":"27","url":"https://github.com/allure-framework/allure-docs/issues/27","type":"issue"},{"name":"25","url":"https://github.com/allure-framework/allure-docs/issues/25","type":"tms"}],"name":"shouldDisplayUserBalance","status":"passed","statusDetails":{"known":false,"muted":false,"flaky":false},"stage":"finished","start":1495892654569,"stop":1495892654575,"steps":[{"name":"Open LoginPage","status":"passed","stage":"finished","start":1495892654570,"stop":1495892654570,"parameters":[{"name":"name","value":"LoginPage"}]},{"name":"Log into web site.","status":"passed","stage":"finished","start":1495892654570,"stop":1495892654572,"steps":[{"name":"Type \"dummyUsername\" into \"Username\" input.","status":"passed","stage":"finished","start":1495892654570,"stop":1495892654571,"attachments":[{"name":"Log","source":"378164c5-e5b0-46d0-92e9-e98ae36ad748-attachment","type":"text/plain"}],"parameters":[{"name":"username","value":"dummyUsername"}]},{"name":"Type \"dummyPassword\" into \"Password\" input.","status":"passed","stage":"finished","start":1495892654571,"stop":1495892654571,"parameters":[{"name":"password","value":"dummyPassword"}]},{"name":"Click button \"Log On\"","status":"passed","stage":"finished","start":1495892654571,"stop":1495892654572,"steps":[{"name":"Open HomePage","status":"passed","stage":"finished","start":1495892654571,"stop":1495892654572,"parameters":[{"name":"name","value":"HomePage"}]}]}],"parameters":[{"name":"user","value":"User(username=dummyUsername, password=dummyPassword)"}]},{"name":"Display balance","status":"passed","stage":"finished","start":1495892654572,"stop":1495892654575,"attachments":[{"name":"Archive","source":"42ea0be1-b76d-4b04-8ce1-7c80fb7edea5-attachment","type":"application/gzip"},{"name":"Config","source":"6600af0b-9392-40ff-b7a0-c2878ea1a81f-attachment","type":"application/xml"},{"name":"Data","source":"43fa1d80-ba69-4aea-9eac-d92adb81c8bc-attachment","type":"application/json"},{"name":"Links","source":"af2ec9e5-99b6-4a7b-a432-372f149bbe23-attachment","type":"text/uri-list"},{"name":"Log","source":"2ffa6db1-d2e4-448d-ad93-3df677e51e4d-attachment","type":"text/plain"},{"name":"HTML","source":"1c43e04d-e3eb-4039-a269-b6b1653ab539-attachment","type":"text/html"},{"name":"Table","source":"e696b7dc-de41-4601-b2d6-d7141b1e80c0-attachment","type":"text/csv"},{"name":"Video","source":"6ca42b2d-3a93-4e38-9e9b-9db963726644-attachment","type":"video/webm"}]}],"attachments":[{"name":"Test log","source":"db2c5aa0-7b68-4480-9e04-3444c78271a8-attachment","type":"text/plain"}],"parameters":[{"name":"arg0","value":"User(username=dummyUsername, password=dummyPassword)"}]}

0 comments on commit d76f2e4

Please # to comment.