Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

hot fix - side panel conditional tests presentation #399

Merged
merged 5 commits into from
Oct 23, 2018
Merged

hot fix - side panel conditional tests presentation #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33768ff
hot fix - side panel conditional tests presentation
Oct 16, 2018
65406d3
updated changelog
Oct 16, 2018
5e1ab46
updated changelog - moved info to unreleased section
Oct 17, 2018
00cb1ce
Merge branch 'master' into hotfix/conditional-tests-side-panel
ernestosiak Oct 18, 2018
27e2c28
Merge branch 'master' into hotfix/conditional-tests-side-panel
ernestosiak Oct 22, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ All notable changes to AET will be documented in this file.

## Unreleased
**List of changes that are finished but not yet released in any final version.**
- [PR-399](https://github.com/Cognifide/aet/pull/399) Bug fix on side panel - conditional tests ([#398](https://github.com/Cognifide/aet/issues/398))
- [PR-396](https://github.com/Cognifide/aet/pull/396) Added horizontal scrollbar for wide pages ([#393](https://github.com/Cognifide/aet/issues/393))
- [PR-403](https://github.com/Cognifide/aet/pull/403) Conditionally passed tests can be accepted ([#400](https://github.com/Cognifide/aet/issues/400))
- [PR-387](https://github.com/Cognifide/aet/pull/387) Set max allowed page screenshot height to 35k pixels.
Expand Down
8 changes: 4 additions & 4 deletions report/src/main/webapp/app/layout/sidepanel/sidepanel.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@
<li ng-repeat="url in test.urls | filter: {name: $root.searchText} | aetUrlStatusFilter:$root.activeFilters | orderBy:'name' as filteredUrls"
ng-class="[url.getStatus()]" class="url-name">
<div aet-truncate-urls class="text-left nowrap">
<div ng-if="test.getStatus() != 'rebased' && test.getStatus() != 'conditionallyPassed'" class="failed">
<i class="fas {{theme.statusClasses[test.getStatus()]}}"></i>
<div ng-if="url.getStatus() != 'rebased' && url.getStatus() != 'conditionallyPassed'" class="failed">
<i class="fas {{theme.statusClasses[url.getStatus()]}}"></i>
</div>
<div ng-if="test.getStatus() == 'rebased' || test.getStatus() == 'conditionallyPassed'">
<i class="fas {{theme.statusClasses[test.getStatus()]}}"></i>
<div ng-if="url.getStatus() == 'rebased' || url.getStatus() == 'conditionallyPassed'">
<i class="fas {{theme.statusClasses[url.getStatus()]}}"></i>
</div>
<a class="test-url" ui-sref-active="is-active"
ui-sref="url({'suite':$root.params.project,'test':test.name, 'url':url.name})">
Expand Down