Skip to content

Commit

Permalink
Remove review_-suffix from review_all_* variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@Martchus
Martchus committed Dec 5, 2016
1 parent ac95b1d commit 7478b6a
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 56 deletions.
4 changes: 2 additions & 2 deletions assets/stylesheets/openqa.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,11 +548,11 @@ a.restart-link {
opacity: 0.5;
}

.review-all-passed {
.badge-all-passed {
color: $color-module-passed;
}

.review-all-passed-or-softfailed {
.badge-all-passed-or-softfailed {
color: $color-module-softfailed;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/OpenQA/BuildResults.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ sub count_job {
sub add_review_badge {
my ($build_res) = @_;

$build_res->{reviewed_all_passed} = $build_res->{passed} == $build_res->{total};
$build_res->{reviewed_all_passed_or_softfailed}
$build_res->{all_passed} = $build_res->{passed} == $build_res->{total};
$build_res->{all_passed_or_softfailed}
= $build_res->{passed} + $build_res->{softfailed} == $build_res->{total};
$build_res->{reviewed} = $build_res->{failed} > 0 && $build_res->{labeled} >= $build_res->{failed};
$build_res->{reviewed_also_softfailed}
Expand Down
12 changes: 6 additions & 6 deletions t/22-dashboard.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ sub check_test_parent {
'link URLs'
);

$t->element_count_is("div.children-$default_expanded .review-all-passed", 1, 'badge shown on parent-level');
$t->element_count_is("div.children-$default_expanded h4 span i.tag", 0, 'no tags shown yet');
$t->element_count_is("div.children-$default_expanded .badge-all-passed", 1, 'badge shown on parent-level');
$t->element_count_is("div.children-$default_expanded h4 span i.tag", 0, 'no tags shown yet');
}
check_test_parent('collapsed');

Expand Down Expand Up @@ -219,17 +219,17 @@ $not_reviewed_job->delete();
sub check_auto_badge {
my ($all_passed_count, $all_passed_or_softfailed_count, $build) = @_;
$build //= '0092';
$t->element_count_is('#review-all-passed-' . $test_parent->id . '-' . $build,
$t->element_count_is('#badge-all-passed-' . $test_parent->id . '-' . $build,
$all_passed_count, "all passed review badge shown for build $build on parent level");
$t->element_count_is('#child-review-all-passed-' . $test_parent->id . '-' . $build,
$t->element_count_is('#child-badge-all-passed-' . $test_parent->id . '-' . $build,
$all_passed_count, "all passed review badge shown for build $build on child-level");
$t->element_count_is(
'#review-all-passed-or-softfailed-' . $test_parent->id . '-' . $build,
'#badge-all-passed-or-softfailed-' . $test_parent->id . '-' . $build,
$all_passed_or_softfailed_count,
"all passed review badge shown for build $build on parent level"
);
$t->element_count_is(
'#child-review-all-passed-or-softfailed-' . $test_parent->id . '-' . $build,
'#child-badge-all-passed-or-softfailed-' . $test_parent->id . '-' . $build,
$all_passed_or_softfailed_count,
"all passed review badge shown for build $build on child-level"
);
Expand Down
68 changes: 34 additions & 34 deletions t/api/04-jobs.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,23 +294,23 @@ delete $b48->{oldest};
is_deeply(
$b48,
{
reviewed => '',
softfailed => 1,
softfailed_with_failed_modules => 0,
failed => 1,
labeled => 0,
labeled_softfailed => 0,
all_labeled => 0,
reviewed_all_passed => '',
reviewed_all_passed_or_softfailed => '',
reviewed_also_softfailed => '',
total => 3,
passed => 0,
skipped => 0,
distri => 'opensuse',
unfinished => 1,
version => 'Factory',
escaped_id => '0048',
reviewed => '',
softfailed => 1,
softfailed_with_failed_modules => 0,
failed => 1,
labeled => 0,
labeled_softfailed => 0,
all_labeled => 0,
all_passed => '',
all_passed_or_softfailed => '',
reviewed_also_softfailed => '',
total => 3,
passed => 0,
skipped => 0,
distri => 'opensuse',
unfinished => 1,
version => 'Factory',
escaped_id => '0048',
},
'Build 0048 exported'
);
Expand All @@ -325,23 +325,23 @@ delete $b1->{oldest};
is_deeply(
$b1,
{
passed => 1,
version => '13.1',
distri => 'opensuse',
labeled => 0,
labeled_softfailed => 0,
all_labeled => 0,
total => 1,
failed => 0,
unfinished => 0,
skipped => 0,
reviewed => '',
softfailed => 0,
softfailed_with_failed_modules => 0,
reviewed_all_passed => 1,
reviewed_all_passed_or_softfailed => 1,
reviewed_also_softfailed => '',
escaped_id => '0092',
passed => 1,
version => '13.1',
distri => 'opensuse',
labeled => 0,
labeled_softfailed => 0,
all_labeled => 0,
total => 1,
failed => 0,
unfinished => 0,
skipped => 0,
reviewed => '',
softfailed => 0,
softfailed_with_failed_modules => 0,
all_passed => 1,
all_passed_or_softfailed => 1,
reviewed_also_softfailed => '',
escaped_id => '0092',
},
'Build 92 of opensuse'
);
Expand Down
9 changes: 3 additions & 6 deletions t/ui/15-comments.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ is($driver->get_title(), "openQA", "back on main page");
# check 'reviewed' labels
my $get = $t->get_ok($driver->get_current_url())->status_is(200);
$get->element_exists_not('.review', 'no build is marked as \'reviewed\' as there are no comments yet');
$get->element_exists('.review-all-passed', 'exactly one build is marked as \'reviewed\' because all tests passed');
$get->element_exists('.badge-all-passed', 'exactly one build is marked as \'reviewed\' because all tests passed');

$driver->find_element('opensuse', 'link_text')->click();

Expand Down Expand Up @@ -299,11 +299,8 @@ subtest 'commenting in test results including labels' => sub {
is($get->tx->res->dom->at('#res_DVD_x86_64_doc .fa-bug')->parent->{href},
'https://bugzilla.suse.com/show_bug.cgi?id=1234');
$driver->find_element('opensuse', 'link_text')->click();
is(
$driver->find_element('.review-all-passed', 'css')->get_attribute('title'),
'Reviewed (all passed)',
'build should be marked because all tests passed'
);
is($driver->find_element('.badge-all-passed', 'css')->get_attribute('title'),
'All passed', 'build should be marked because all tests passed');

subtest 'progress items work, too' => sub {
$driver->get($baseurl . 'tests/99926#comments');
Expand Down
12 changes: 6 additions & 6 deletions templates/main/review_badge.html.ep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<i class="review fa fa-certificate" title="Reviewed (<%= $build_res->{all_labeled}; %> <%= $build_res->{all_labeled} == 1 ? 'comment' : 'comments' %>)"></i>
</span>
% }
% if ($build_res->{reviewed_all_passed}) {
<span id="<%= $id_prefix %>review-all-passed-<%= $group_build_id %>">
<i class="review-all-passed fa fa-certificate" title="Reviewed (all passed)"></i>
% if ($build_res->{all_passed}) {
<span id="<%= $id_prefix %>badge-all-passed-<%= $group_build_id %>">
<i class="badge-all-passed fa fa-certificate" title="All passed"></i>
</span>
% }
% elsif ($build_res->{reviewed_all_passed_or_softfailed}) {
<span id="<%= $id_prefix %>review-all-passed-or-softfailed-<%= $group_build_id %>">
<i class="review-all-passed-or-softfailed fa fa-certificate" title="Reviewed (all either passed or softfailed)"></i>
% elsif ($build_res->{all_passed_or_softfailed}) {
<span id="<%= $id_prefix %>badge-all-passed-or-softfailed-<%= $group_build_id %>">
<i class="badge-all-passed-or-softfailed fa fa-certificate" title="All either passed or softfailed"></i>
</span>
% }

0 comments on commit 7478b6a

Please sign in to comment.