Changeset 1447


Ignore:
Timestamp:
Dec 18, 2012, 6:15:56 PM (9 years ago)
Author:
Dominic Hargreaves
Message:

Fix several test failures triggered by the stricter Test::HTML::Content (et al) found in current Debian unstable.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Changes

    r1446 r1447  
    660.71    ?
    77        Added scale to category/locale index maps.
     8        Fix several test failures triggered by the stricter
     9          Test::HTML::Content (et al) found in current Debian unstable.
    810
    9110.70    26 August 2012
  • trunk/t/701_missing_metadata.t

    r1417 r1447  
    123123# Test the normal, HTML version
    124124my $output = eval {
    125     $guide->show_missing_metadata( return_output=>1 );
     125    $guide->show_missing_metadata( return_output=>1,
     126                                   noheaders => 1);
    126127};
    127128is( $@, "",
     
    135136$output = eval {
    136137    $guide->show_missing_metadata( return_output => 1,
    137                                    metadata_type => "latitude" );
     138                                   metadata_type => "latitude",
     139                                   noheaders => 1);
    138140};
    139141is( $@, "", "->show_missing_metadata doesn't die when called with "
  • trunk/t/906_show_index_form.t

    r1382 r1447  
    3636};
    3737ok( !$@, "->make_index_form_dropdowns doesn't die when no criteria supplied" );
    38 my $html = join( " ", ( map { $_->{html} } @dropdowns ) );
     38my $html = '<html>' . join( " ", ( map { $_->{html} } @dropdowns ) ) . '</html>';
    3939Test::HTML::Content::tag_ok( $html, "select", { name => "cat" },
    4040                             "...and we have a 'cat' select" );
     
    6464};
    6565ok( !$@, "->make_index_form_dropdowns doesn't die when category supplied" );
    66 $html = join( " ", ( map { $_->{html} } @dropdowns ) );
     66$html = '<html>' . join( " ", ( map { $_->{html} } @dropdowns ) ) . '</html>';
    6767Test::HTML::Content::tag_ok( $html, "select", { name => "cat" },
    6868                             "...and we have a 'cat' select" );
     
    9898};
    9999ok( !$@, "->make_index_form_dropdowns doesn't die when locale supplied" );
    100 $html = join( " ", ( map { $_->{html} } @dropdowns ) );
     100$html = '<html>' . join( " ", ( map { $_->{html} } @dropdowns ) ). '</html>';
    101101Test::HTML::Content::tag_ok( $html, "select", { name => "cat" },
    102102                             "...and we have a 'cat' select" );
     
    136136ok( !$@,
    137137  "->make_index_form_dropdowns doesn't die when locale and categorysupplied" );
    138 $html = join( " ", ( map { $_->{html} } @dropdowns ) );
     138$html = '<html>' . join( " ", ( map { $_->{html} } @dropdowns ) ). '</html>';
    139139Test::HTML::Content::tag_ok( $html, "select", { name => "cat" },
    140140                             "...and we have a 'cat' select" );
  • trunk/templates/header.tt

    r1436 r1447  
    7272  [% UNLESS not_editable %]
    7373    <link rel="alternate" type="application/wiki" title="Edit this page!"
    74      href="[% source_site or full_cgi_url %]?id=[% node_param %];action=edit">
     74     href="[% source_site or full_cgi_url %]?id=[% node_param %];action=edit" />
    7575  [% END %]
    7676
  • trunk/templates/preferences.tt

    r1401 r1447  
    1515    <p>
    1616    [% IF prefs.preview_above_edit_box %]
    17       <input type="checkbox" id="preview_above" name="preview_above_edit_box" value="1" checked />
     17      <input type="checkbox" id="preview_above" name="preview_above_edit_box" value="1" checked="1" />
    1818    [% ELSE %]
    1919      <input type="checkbox" id="preview_above" name="preview_above_edit_box" value="1" />
     
    2424    <p>
    2525    [% IF prefs.include_geocache_link %]
    26       <input type="checkbox" id="geocache" name="include_geocache_link" value="1" checked />
     26      <input type="checkbox" id="geocache" name="include_geocache_link" value="1" checked="1" />
    2727    [% ELSE %]
    2828      <input type="checkbox" id="geocache" name="include_geocache_link" value="1" />
     
    3333    <p>
    3434    [% IF prefs.latlong_traditional %]
    35       <input type="checkbox" id="latlong" name="latlong_traditional" value="1" checked />
     35      <input type="checkbox" id="latlong" name="latlong_traditional" value="1" checked="1" />
    3636    [% ELSE %]
    3737      <input type="checkbox" id="latlong" name="latlong_traditional" value="1" />
     
    4242    <p>
    4343    [% IF prefs.omit_help_links %]
    44       <input type="checkbox" id="omit_help" name="omit_help_links" value="1" checked />
     44      <input type="checkbox" id="omit_help" name="omit_help_links" value="1" checked="1" />
    4545    [% ELSE %]
    4646      <input type="checkbox" id="omit_help" name="omit_help_links" value="1" />
     
    5151    <p>
    5252    [% IF prefs.show_minor_edits_in_rc %]
    53       <input type="checkbox" id="show_minor" name="show_minor_edits_in_rc" value="1" checked />
     53      <input type="checkbox" id="show_minor" name="show_minor_edits_in_rc" value="1" checked="1" />
    5454    [% ELSE %]
    5555      <input type="checkbox" id="show_minor" name="show_minor_edits_in_rc" value="1" />
     
    6060    <p>
    6161    [% IF prefs.is_admin %]
    62       <input type="checkbox" id="is_admin" name="is_admin" value="1" checked />
     62      <input type="checkbox" id="is_admin" name="is_admin" value="1" checked="1" />
    6363    [% ELSE %]
    6464      <input type="checkbox" id="is_admin" name="is_admin" value="1" />
     
    121121
    122122    <input type="submit" value="Set it" class="form_button" />
    123     <input type="hidden" name="action" value="set_preferences">
     123    <input type="hidden" name="action" value="set_preferences" />
    124124    [% IF return_to_url %]
    125125      <input type="hidden" name="return_to_url"
Note: See TracChangeset for help on using the changeset viewer.