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.

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

Various Fixes for Broken Link(s) , Skip field can now be charted on the progress graphs #10

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
9 changes: 9 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
Revision history for Smolder

1.52
+ Modifed subject line in smoke report e-mail to display more detail - P. Leonard, K. McDaniel
+ Fixed problem where the AutoRedirectToProject configuration directive would redirect to a broken link - K. McDaniel
+ Fixed broken link(s) for progess graphs on project listing pages - K. McDaniel
+ Fixed broken link to the full report within the smoke report e-mail(s) - P. Leonard, K. McDaniel
+ Fixed auto completion for platform and architecture fields when submitting a new smoke report - P. Leonard
+ Fixed RT #55514 by removing references of developer_X and public_X within the URLs - P. Leonard
+ Fixed RT #84077 by enabling the skip field to be charted on the progress graphs - K. McDaniel

1.51
+ Fixed problem on machines with multiple IP addresses and other services bound to port 80 on different IPs - M. Peters
+ Another go at using images in POD - M. Peters
Expand Down
4 changes: 2 additions & 2 deletions htdocs/js/smolder.js
Original file line number Diff line number Diff line change
Expand Up @@ -813,15 +813,15 @@ var myrules = {
new Ajax.Autocompleter(
'platform',
'platform_auto_complete',
'/app/developer_projects/platform_options'
'/app/projects/platform_options'
);
},

'#architecture_auto_complete' : function(element) {
new Ajax.Autocompleter(
'architecture',
'architecture_auto_complete',
'/app/developer_projects/architecture_options'
'/app/projects/architecture_options'
);
},

Expand Down
3 changes: 1 addition & 2 deletions lib/Smolder/Control/Projects.pm
Original file line number Diff line number Diff line change
Expand Up @@ -813,8 +813,7 @@ sub feed {
foreach my $report (@reports) {
my $link =
Smolder::Util::url_base() . '/app/'
. ($project->public ? 'public' : 'developer')
. '_projects/smoke_report/'
. 'projects/smoke_report/'
. $report->id;
$feed->add_entry(
title => '#'
Expand Down
2 changes: 1 addition & 1 deletion lib/Smolder/Control/Public.pm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sub welcome {
my $self = shift;
if (my $project_id = Smolder::Conf->get('AutoRedirectToProject')) {
$self->header_type('redirect');
$self->header_add( -uri => "/app/public_projects/smoke_reports/$project_id" );
$self->header_add( -uri => "/app/projects/smoke_reports/$project_id" );
return "redirecting";
}
else {
Expand Down
13 changes: 11 additions & 2 deletions lib/Smolder/DB/SmokeReport.pm
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,18 @@ sub _slurp_file {
sub _send_emails {
my ($self, $results) = @_;

# determine the appropriate status for the e-mail
my $status = ( $self->failed() ? "FAILURE" : "SUCCESS" );
$status = "WARNING" if( $self->skip > 0 );
$status = "ABORTED" if( $self->skip == $self->pass );
# setup some stuff for the emails that we only need to do once
my $subject =
"[" . $self->project->name . "] new " . ($self->failed ? "failed " : '') . "Smolder report";
my $subject = sprintf("Smolder - [%s] %i files ( %i/%i ) : %s",
$self->project->name,
$self->test_files,
int( $self->pass - $self->skip ),
$self->total,
$status );

my $matrix = Smolder::TAPHTMLMatrix->new(
smoke_report => $self,
test_results => $results,
Expand Down
2 changes: 1 addition & 1 deletion lib/Smolder/Manual.pm
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Or you can use the C<LWP> Perl library directly (and there's probably a way
to do it just using C<curl> from the command line.

LWP::UserAgent->new()->post(
'http://smolder.project.org/app/developer_projects/add_report/$project_id',
'http://smolder.project.org/app/projects/add_report/$project_id',
Content_Type => 'form-data',
Content => [
architecture => '386',
Expand Down
2 changes: 1 addition & 1 deletion templates/Email/smoke_report_full.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="content">
<div id="page_title">
<h1>Test Details #[% report.id %]</h1>
<a href="[% url_base %]/app/developer_projects/report_details/[% report.id %]">[View Full Report]</a>
<a href="[% url_base %]/app/projects/report_details/[% report.id %]">[View Full Report]</a>
</div>

<div class="tap">
Expand Down
2 changes: 1 addition & 1 deletion templates/Email/smoke_report_link.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ A new smoke report has been added to the [% report.project.name %] project
at <a href="[% url_base %]">[% url_base %]</a>.
<br />
You can find the details of this test at
[% SET my_url = "$url_base/app/developer_projects/smoke_report/${report.id}" %]
[% SET my_url = "$url_base/app/projects/smoke_report/${report.id}" %]
<a href="[% my_url %]">[% my_url %]</a>.
<br />

Expand Down
2 changes: 1 addition & 1 deletion templates/Graphs/start.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<input type="checkbox" id="fail" name="fail" value="1" />Fail
<input type="checkbox" id="todo" name="todo" value="1" />Todo
<input type="checkbox" id="skip" name="skip" value="1" />Skip
<input type="checkbox" id="skip" name="duration" value="1" />Duration
<input type="checkbox" id="duration" name="duration" value="1" />Duration
</td>
</tr>
[% IF project.platforms.size || project.architectures.size %]
Expand Down
2 changes: 1 addition & 1 deletion templates/Projects/public.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ul>
<li><a href="/app/projects/add_report/[% project.id %]">Add Smoke Report</a></li>
<li><a href="/app/projects/smoke_reports/[% project.id %]">Most Recent Smoke Tests</a></li>
<li><a href="/app/developer_graphs/start/[% project.id %]">Progress Graphs</a></li>
<li><a href="/app/graphs/start/[% project.id %]">Progress Graphs</a></li>
[% IF project.is_admin(c.developer) %]
<li><a href="/app/projects/admin_settings/[% project.id %]">Project Settings</a></li>
[% END %]
Expand Down
2 changes: 1 addition & 1 deletion templates/Projects/show_all.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ul>
<li><a href="/app/projects/add_report/[% project.id %]">Add Smoke Report</a></li>
<li><a href="/app/projects/smoke_reports/[% project.id %]">Most Recent Smoke Tests</a></li>
<li><a href="/app/developer_graphs/start/[% project.id %]">Progress Graphs</a></li>
<li><a href="/app/graphs/start/[% project.id %]">Progress Graphs</a></li>
[% IF project.is_admin(c.developer) %]
<li><a href="/app/projects/admin_settings/[% project.id %]">Project Settings</a></li>
[% END %]
Expand Down