From d76f2e4e5520ecf6f2045f76157be0818a931100 Mon Sep 17 00:00:00 2001 From: Stanislav Seliverstov Date: Mon, 31 Jul 2017 15:29:30 +0300 Subject: [PATCH] fix html attachments (fixes #496, via #505) --- .../components/attachment/AttachmentView.hbs | 2 ++ .../components/attachment/styles.scss | 10 +++++-- ...04d-e3eb-4039-a269-b6b1653ab539-attachment | 28 +++++++++++++++++++ ...30-4e5e-46d0-8cbc-0ce4502b5adc-result.json | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 allure-generator/test-data/demo2/1c43e04d-e3eb-4039-a269-b6b1653ab539-attachment diff --git a/allure-generator/src/main/javascript/components/attachment/AttachmentView.hbs b/allure-generator/src/main/javascript/components/attachment/AttachmentView.hbs index 2ae2110a5..023f392d8 100644 --- a/allure-generator/src/main/javascript/components/attachment/AttachmentView.hbs +++ b/allure-generator/src/main/javascript/components/attachment/AttachmentView.hbs @@ -46,6 +46,8 @@

{{/each}} +{{else if (eq type "html")}} + {{else}}
diff --git a/allure-generator/src/main/javascript/components/attachment/styles.scss b/allure-generator/src/main/javascript/components/attachment/styles.scss index f713e408e..d99640191 100644 --- a/allure-generator/src/main/javascript/components/attachment/styles.scss +++ b/allure-generator/src/main/javascript/components/attachment/styles.scss @@ -50,6 +50,9 @@ cursor: zoom-out; } } + &__iframe-container { + height: 100%; + } &__embed, &__media { max-width: 100%; display: block; @@ -61,6 +64,9 @@ } &__iframe { width: 100%; - flex: 1; + &_fullscreen { + background-color: $pane-bg-color; + height: 85vh; + } } -} +} \ No newline at end of file diff --git a/allure-generator/test-data/demo2/1c43e04d-e3eb-4039-a269-b6b1653ab539-attachment b/allure-generator/test-data/demo2/1c43e04d-e3eb-4039-a269-b6b1653ab539-attachment new file mode 100644 index 000000000..148f9723f --- /dev/null +++ b/allure-generator/test-data/demo2/1c43e04d-e3eb-4039-a269-b6b1653ab539-attachment @@ -0,0 +1,28 @@ + + +

HTML

+

HTML

+

HTML

+

HTML

+
HTML
+
HTML
+

HTML

+

HTML

+

HTML

+

HTML

+
HTML
+
HTML
+

HTML

+

HTML

+

HTML

+

HTML

+
HTML
+
HTML
+

HTML

+

HTML

+

HTML

+

HTML

+
HTML
+
HTML
+ + \ No newline at end of file diff --git a/allure-generator/test-data/demo2/ea754c30-4e5e-46d0-8cbc-0ce4502b5adc-result.json b/allure-generator/test-data/demo2/ea754c30-4e5e-46d0-8cbc-0ce4502b5adc-result.json index b5a2a7384..bd7bcb450 100644 --- a/allure-generator/test-data/demo2/ea754c30-4e5e-46d0-8cbc-0ce4502b5adc-result.json +++ b/allure-generator/test-data/demo2/ea754c30-4e5e-46d0-8cbc-0ce4502b5adc-result.json @@ -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)"}]} \ No newline at end of file +{"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)"}]} \ No newline at end of file