Skip to content

Commit

Permalink
251 nested dir images (#253)
Browse files Browse the repository at this point in the history 
* some cleanup

* honour basepath for images in the nested html, fixes #251

* fixed expectation for regenrate

* fixed filepath for nested suite result

* add test for spec basepath propogation

* fix basepath propogation for concept steps
  • Loading branch information
@sriv
sriv authored Mar 6, 2020
1 parent 253bee4 commit 77ec935
Show file tree
Hide file tree
Showing 34 changed files with 1,110 additions and 356 deletions.
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,12 @@ Report re-generation

If report generation fails due to some reason, we don't have to re-run the tests again.

The html-report plugin now generates a last_run_result.json file in the root of the reports directory.
There is also a symlink to the html-report executable in the same location.
Gauge now generates a last_run_result file in the `.gauge` folder under the Project Root. There is also a symlink to the html-report executable in the same location.

**To regenerate the report**

- Navigate to the reports directory
- run ./html-report --input=last_run_result.json --output="/some/path"
- run ./html-report --input=last_run_result --output="/some/path"

**Note:** The output directory is created. Take care not to overwrite an existing directory

Expand Down
2 changes: 1 addition & 1 deletion gauge-proto
Submodule gauge-proto updated 2 files
+34 −0 messages.proto
+16 −3 services.proto
396 changes: 321 additions & 75 deletions generator/_testdata/dummyReportTheme/views/partials.tmpl
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions generator/_testdata/expectedE2E/before_suite_fail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ <h2 class="project">Project: Gauge Project</h2>
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="./images/failure-screenshot-file.png" rel="lightbox">
<img src="./images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down Expand Up @@ -140,8 +140,8 @@ <h2 class="project">Project: Gauge Project</h2>
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="./images/failure-screenshot-file.png" rel="lightbox">
<img src="./images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions generator/_testdata/expectedE2E/simpleSuiteRes/failing_specification_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ <h4 class="error-message">
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/failure-screenshot-file.png" rel="lightbox">
<img src="../images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
20 changes: 10 additions & 10 deletions ...ator/_testdata/expectedE2E/simpleSuiteResWithHookScreenshots/failing_specification_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,26 @@ <h2 class="project">Project: Gauge Project</h2>
<div>Before Suite Screenshots</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/pre-hook-screenshot-1.png" rel="lightbox">
<img src="../images/pre-hook-screenshot-1.png" class="screenshot-thumbnail" />
<a href="images/pre-hook-screenshot-1.png" rel="lightbox">
<img src="images/pre-hook-screenshot-1.png" class="screenshot-thumbnail" />
</a>
</div>
<div class="screenshot">
<a href="../images/pre-hook-screenshot-2.png" rel="lightbox">
<img src="../images/pre-hook-screenshot-2.png" class="screenshot-thumbnail" />
<a href="images/pre-hook-screenshot-2.png" rel="lightbox">
<img src="images/pre-hook-screenshot-2.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
<div>After Suite Screenshots</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/post-hook-screenshot-1.png" rel="lightbox">
<img src="../images/post-hook-screenshot-1.png" class="screenshot-thumbnail" />
<a href="images/post-hook-screenshot-1.png" rel="lightbox">
<img src="images/post-hook-screenshot-1.png" class="screenshot-thumbnail" />
</a>
</div>
<div class="screenshot">
<a href="../images/post-hook-screenshot-2.png" rel="lightbox">
<img src="../images/post-hook-screenshot-2.png" class="screenshot-thumbnail" />
<a href="images/post-hook-screenshot-2.png" rel="lightbox">
<img src="images/post-hook-screenshot-2.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down Expand Up @@ -220,8 +220,8 @@ <h4 class="error-message">
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/failure-screenshot-file.png" rel="lightbox">
<img src="../images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions generator/_testdata/expectedE2E/simpleSuiteResWithHookScreenshots/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,26 @@ <h2 class="project">Project: Gauge Project</h2>
<div>Before Suite Screenshots</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="./images/pre-hook-screenshot-1.png" rel="lightbox">
<img src="./images/pre-hook-screenshot-1.png" class="screenshot-thumbnail" />
<a href="images/pre-hook-screenshot-1.png" rel="lightbox">
<img src="images/pre-hook-screenshot-1.png" class="screenshot-thumbnail" />
</a>
</div>
<div class="screenshot">
<a href="./images/pre-hook-screenshot-2.png" rel="lightbox">
<img src="./images/pre-hook-screenshot-2.png" class="screenshot-thumbnail" />
<a href="images/pre-hook-screenshot-2.png" rel="lightbox">
<img src="images/pre-hook-screenshot-2.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
<div>After Suite Screenshots</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="./images/post-hook-screenshot-1.png" rel="lightbox">
<img src="./images/post-hook-screenshot-1.png" class="screenshot-thumbnail" />
<a href="images/post-hook-screenshot-1.png" rel="lightbox">
<img src="images/post-hook-screenshot-1.png" class="screenshot-thumbnail" />
</a>
</div>
<div class="screenshot">
<a href="./images/post-hook-screenshot-2.png" rel="lightbox">
<img src="./images/post-hook-screenshot-2.png" class="screenshot-thumbnail" />
<a href="images/post-hook-screenshot-2.png" rel="lightbox">
<img src="images/post-hook-screenshot-2.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions ...ator/_testdata/expectedE2E/simpleSuiteResWithHookScreenshots/passing_specification_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,26 +79,26 @@ <h2 class="project">Project: Gauge Project</h2>
<div>Before Suite Screenshots</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/pre-hook-screenshot-1.png" rel="lightbox">
<img src="../images/pre-hook-screenshot-1.png" class="screenshot-thumbnail" />
<a href="images/pre-hook-screenshot-1.png" rel="lightbox">
<img src="images/pre-hook-screenshot-1.png" class="screenshot-thumbnail" />
</a>
</div>
<div class="screenshot">
<a href="../images/pre-hook-screenshot-2.png" rel="lightbox">
<img src="../images/pre-hook-screenshot-2.png" class="screenshot-thumbnail" />
<a href="images/pre-hook-screenshot-2.png" rel="lightbox">
<img src="images/pre-hook-screenshot-2.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
<div>After Suite Screenshots</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/post-hook-screenshot-1.png" rel="lightbox">
<img src="../images/post-hook-screenshot-1.png" class="screenshot-thumbnail" />
<a href="images/post-hook-screenshot-1.png" rel="lightbox">
<img src="images/post-hook-screenshot-1.png" class="screenshot-thumbnail" />
</a>
</div>
<div class="screenshot">
<a href="../images/post-hook-screenshot-2.png" rel="lightbox">
<img src="../images/post-hook-screenshot-2.png" class="screenshot-thumbnail" />
<a href="images/post-hook-screenshot-2.png" rel="lightbox">
<img src="images/post-hook-screenshot-2.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions generator/_testdata/expectedE2E/simpleSuiteResWithHookScreenshots/skipped_specification.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,26 @@ <h2 class="project">Project: Gauge Project</h2>
<div>Before Suite Screenshots</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/pre-hook-screenshot-1.png" rel="lightbox">
<img src="../images/pre-hook-screenshot-1.png" class="screenshot-thumbnail" />
<a href="images/pre-hook-screenshot-1.png" rel="lightbox">
<img src="images/pre-hook-screenshot-1.png" class="screenshot-thumbnail" />
</a>
</div>
<div class="screenshot">
<a href="../images/pre-hook-screenshot-2.png" rel="lightbox">
<img src="../images/pre-hook-screenshot-2.png" class="screenshot-thumbnail" />
<a href="images/pre-hook-screenshot-2.png" rel="lightbox">
<img src="images/pre-hook-screenshot-2.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
<div>After Suite Screenshots</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/post-hook-screenshot-1.png" rel="lightbox">
<img src="../images/post-hook-screenshot-1.png" class="screenshot-thumbnail" />
<a href="images/post-hook-screenshot-1.png" rel="lightbox">
<img src="images/post-hook-screenshot-1.png" class="screenshot-thumbnail" />
</a>
</div>
<div class="screenshot">
<a href="../images/post-hook-screenshot-2.png" rel="lightbox">
<img src="../images/post-hook-screenshot-2.png" class="screenshot-thumbnail" />
<a href="images/post-hook-screenshot-2.png" rel="lightbox">
<img src="images/post-hook-screenshot-2.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions generator/_testdata/integration/after_scenario_fail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ <h5 class='execution-time'>
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/failure-screenshot-file.png" rel="lightbox">
<img src="../images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions generator/_testdata/integration/after_spec_fail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,8 @@ <h5 class='execution-time'>
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/failure-screenshot-file.png" rel="lightbox">
<img src="../images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions generator/_testdata/integration/after_step_fail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ <h5 class='execution-time'>
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/failure-screenshot-file.png" rel="lightbox">
<img src="../images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions generator/_testdata/integration/after_suite_fail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ <h2 class="project">Project: Gauge Project</h2>
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/failure-screenshot-file.png" rel="lightbox">
<img src="../images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions generator/_testdata/integration/before_after_scenario_fail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ <h3 class="head borderBottom">Scenario Heading</h3>
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/failure-screenshot-file.png" rel="lightbox">
<img src="../images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down Expand Up @@ -212,8 +212,8 @@ <h3 class="head borderBottom">Scenario Heading</h3>
</div>
<div class="screenshot-container">
<div class="screenshot">
<a href="../images/failure-screenshot-file.png" rel="lightbox">
<img src="../images/failure-screenshot-file.png" class="screenshot-thumbnail" />
<a href="images/failure-screenshot-file.png" rel="lightbox">
<img src="images/failure-screenshot-file.png" class="screenshot-thumbnail" />
</a>
</div>
</div>
Expand Down
Loading

0 comments on commit 77ec935

Please sign in to comment.