openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1274 - trunk
by svnadmin＠urchin.earth.li 14 Sep '09

14 Sep '09

Author: dom Date: 2009-09-14 15:42:36 +0100 (Mon, 14 Sep 2009) New Revision: 1274 Modified: trunk/Changes Log: typo Modified: trunk/Changes =================================================================== --- trunk/Changes 2009-09-04 22:24:51 UTC (rev 1273) +++ trunk/Changes 2009-09-14 14:42:36 UTC (rev 1274) @@ -6,7 +6,7 @@ 0.65 Fix some more broken POD and add POD unit test (#268) Don't display revision info for nodes that don't exist (#193) - Return HTTP 404 status when displaying a node that doens't exist (#102) + Return HTTP 404 status when displaying a node that doesn't exist (#102) Add Recent Changes tests (refers to #270) Some test cleanups (#271)

1 0

r1273 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 04 Sep '09

04 Sep '09

Author: dom Date: 2009-09-04 23:24:51 +0100 (Fri, 04 Sep 2009) New Revision: 1273 Modified: trunk/Changes trunk/lib/OpenGuides/Test.pm trunk/t/01_load.t trunk/t/11_utils.t trunk/t/12_macros.t trunk/t/14_recent_changes_cookies.t trunk/t/16_test_tester.t trunk/t/17_commit_node.t trunk/t/19_autocreate.t trunk/t/20_edit_form.t trunk/t/21_rdf.t trunk/t/22_feed_recent_changes.t trunk/t/23_feed_node_all_versions.t trunk/t/24_feed_node_listings.t trunk/t/25_write_geo_data.t trunk/t/26_geo_data_search_form.t trunk/t/27_geo_data_edit_form.t trunk/t/28_wgs84_coords.t trunk/t/30_search_raw.t trunk/t/31_search.t trunk/t/32_search_simple_metadata.t trunk/t/33_search_advanced_search.t trunk/t/33_search_advanced_search_utm.t trunk/t/34_search_paging.t trunk/t/35_search_two_searches.t trunk/t/36_search_order.t trunk/t/37_search_summaries.t trunk/t/38_search_params.t trunk/t/39_search_form.t trunk/t/40_search_as_feed.t trunk/t/42_edit_conflict.t trunk/t/43_preview_edits.t trunk/t/44_node_image.t trunk/t/45_home_recent_changes.t trunk/t/46_map_in_node_display.t trunk/t/47_navbar_placement.t trunk/t/48_google_analytics.t trunk/t/49_custom_header.t trunk/t/51_display_node.t trunk/t/52_display_diffs.t trunk/t/53_show_index.t trunk/t/54_redirect.t trunk/t/55_node_history.t trunk/t/56_diffs_with_macros.t trunk/t/57_random_page.t trunk/t/58_navbar_common_locales_categories.t trunk/t/59_preferences.t trunk/t/61_bug_textareas.t trunk/t/62_bug_trailing_whitespace.t trunk/t/63_bug_map_link_no_address.t trunk/t/64_bug_node_history.t trunk/t/65_bug_metadata_escape.t trunk/t/66_bug_latlong_representation.t trunk/t/67_bug_first_version.t trunk/t/68_bug_website_displayed.t trunk/t/69_bug_zero_geo.t trunk/t/70_admin_home.t trunk/t/71_missing_metadata.t trunk/t/72_node_moderation.t trunk/t/73_toggle_moderation.t trunk/t/74_ping_plugin.t trunk/t/75_revert_user.t trunk/t/76_detect_spam.t trunk/t/79_host_blacklist.t trunk/t/81_node_moderate_whitelist.t trunk/t/83_show_delete_to_admins_only.t trunk/t/84_navbar_admin.t trunk/t/85_universal_edit_link.t trunk/t/86_recent_changes.t Log: test cleanups for refreshing the test db (thanks bob) (fixes #271) Modified: trunk/Changes =================================================================== --- trunk/Changes 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/Changes 2009-09-04 22:24:51 UTC (rev 1273) @@ -8,6 +8,7 @@ Don't display revision info for nodes that don't exist (#193) Return HTTP 404 status when displaying a node that doens't exist (#102) Add Recent Changes tests (refers to #270) + Some test cleanups (#271) 0.64 23 February 2009 Correctly specify all build_requires (#245) Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/lib/OpenGuides/Test.pm 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,6 +1,7 @@ package OpenGuides::Test; use OpenGuides::Config; +use Wiki::Toolkit::Setup::SQLite; use strict; use vars qw( $VERSION ); @@ -24,6 +25,8 @@ use OpenGuides; use OpenGuides::Test; + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->default_language( "nl" ); @@ -201,6 +204,20 @@ return $q; } +=item B<refresh_db> + + Openguides::Test::refresh_db(); + +Unlink the existing SQLite database t/node.db and plucene indexes. Then create a new SQLite database t/node.db + +=cut +sub refresh_db { + unlink "t/node.db"; + unlink <t/indexes/*>; + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +} + + =back =head1 AUTHOR Modified: trunk/t/01_load.t =================================================================== --- trunk/t/01_load.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/01_load.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Test::More tests => 8; use_ok( "OpenGuides" ); Modified: trunk/t/11_utils.t =================================================================== --- trunk/t/11_utils.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/11_utils.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -2,6 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Utils; +use OpenGuides::Test; use Test::More tests => 10; eval { my $wiki = OpenGuides::Utils->make_wiki_object; }; @@ -33,10 +34,9 @@ unless $have_sqlite; # Clear out the database from any previous runs. - unlink "t/node.db"; - unlink <t/indexes/*>; - Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/12_macros.t =================================================================== --- trunk/t/12_macros.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/12_macros.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -15,9 +15,7 @@ SKIP: { # Clear out the database from any previous runs. - unlink "t/node.db"; - unlink <t/indexes/*>; - Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/14_recent_changes_cookies.t =================================================================== --- trunk/t/14_recent_changes_cookies.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/14_recent_changes_cookies.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -3,6 +3,7 @@ use OpenGuides::Config; use OpenGuides; use OpenGuides::CGI; +use OpenGuides::Test; use Time::Piece; use Time::Seconds; use Test::More tests => 11; @@ -62,8 +63,9 @@ SKIP: { skip "DBD::SQLite could not be used - no database to test with. ($sqlite_error)", 2 unless $have_sqlite; + OpenGuides::Test::refresh_db(); - Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/16_test_tester.t =================================================================== --- trunk/t/16_test_tester.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/16_test_tester.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -17,11 +17,10 @@ plan tests => 2; + # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->site_name( "Test Site" ); my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/17_commit_node.t =================================================================== --- trunk/t/17_commit_node.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/17_commit_node.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -22,10 +22,8 @@ plan tests => 7; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/19_autocreate.t =================================================================== --- trunk/t/19_autocreate.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/19_autocreate.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -18,10 +18,7 @@ my $wiki = $guide->wiki; # Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} + OpenGuides::Test::refresh_db(); # Write a custom template to autofill content in autocreated nodes. eval { Modified: trunk/t/20_edit_form.t =================================================================== --- trunk/t/20_edit_form.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/20_edit_form.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -18,9 +18,7 @@ plan tests => 1; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/21_rdf.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Config; @@ -17,7 +18,10 @@ plan tests => 30; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +# clear out the database +OpenGuides::Test::refresh_db(); + + my $config = OpenGuides::Test->make_basic_config; $config->script_url( "http://wiki.example.com/" ); $config->script_name( "mywiki.cgi" ); @@ -33,10 +37,6 @@ my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} my $rdf_writer = eval { OpenGuides::RDF->new( wiki => $wiki, config => $config ); Modified: trunk/t/22_feed_recent_changes.t =================================================================== --- trunk/t/22_feed_recent_changes.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/22_feed_recent_changes.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -27,10 +27,8 @@ foreach my $feed_type (@feed_types) { # Clear out the database from any previous runs. - unlink "t/node.db"; - unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); - Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); Modified: trunk/t/23_feed_node_all_versions.t =================================================================== --- trunk/t/23_feed_node_all_versions.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/23_feed_node_all_versions.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -4,6 +4,7 @@ use OpenGuides; use OpenGuides::Feed; use OpenGuides::Utils; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -25,10 +26,8 @@ foreach my $feed_type (@feed_types) { # Clear out the database from any previous runs. - unlink "t/node.db"; - unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); - Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/24_feed_node_listings.t =================================================================== --- trunk/t/24_feed_node_listings.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/24_feed_node_listings.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -4,6 +4,7 @@ use OpenGuides; use OpenGuides::Feed; use OpenGuides::Utils; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -25,10 +26,8 @@ foreach my $feed_type (@feed_types) { # Clear out the database from any previous runs. - unlink "t/node.db"; - unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); - Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/25_write_geo_data.t =================================================================== --- trunk/t/25_write_geo_data.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/25_write_geo_data.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -33,10 +33,8 @@ plan tests => 53; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/26_geo_data_search_form.t =================================================================== --- trunk/t/26_geo_data_search_form.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/26_geo_data_search_form.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -37,10 +37,8 @@ plan tests => 12; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: trunk/t/27_geo_data_edit_form.t =================================================================== --- trunk/t/27_geo_data_edit_form.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/27_geo_data_edit_form.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -37,10 +37,8 @@ plan tests => 18; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: trunk/t/28_wgs84_coords.t =================================================================== --- trunk/t/28_wgs84_coords.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/28_wgs84_coords.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -14,10 +14,9 @@ plan tests => 6; # Clear out the database from any previous runs. -unlink "t/node.db"; -# And give us a new one -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + # Now we can start testing my $config = OpenGuides::Test->make_basic_config; $config->force_wgs84 (1); Modified: trunk/t/30_search_raw.t =================================================================== --- trunk/t/30_search_raw.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/30_search_raw.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,10 +13,8 @@ plan tests => 16; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); my $search = OpenGuides::Search->new( config => $config ); Modified: trunk/t/31_search.t =================================================================== --- trunk/t/31_search.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/31_search.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,10 +13,8 @@ plan tests => 18; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -152,4 +150,4 @@ }, ); like( $output, qr/ol start="21"/, - "second page of results starts with right numbering" ); \ No newline at end of file + "second page of results starts with right numbering" ); Modified: trunk/t/32_search_simple_metadata.t =================================================================== --- trunk/t/32_search_simple_metadata.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/32_search_simple_metadata.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -2,6 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -14,10 +15,8 @@ plan tests => 10; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/33_search_advanced_search.t =================================================================== --- trunk/t/33_search_advanced_search.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/33_search_advanced_search.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -25,10 +25,9 @@ plan tests => 8; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/33_search_advanced_search_utm.t =================================================================== --- trunk/t/33_search_advanced_search_utm.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/33_search_advanced_search_utm.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -24,10 +24,9 @@ plan tests => 4; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/34_search_paging.t =================================================================== --- trunk/t/34_search_paging.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/34_search_paging.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -19,10 +19,9 @@ plan tests => 18; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); my $search = OpenGuides::Search->new( config => $config ); Modified: trunk/t/35_search_two_searches.t =================================================================== --- trunk/t/35_search_two_searches.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/35_search_two_searches.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -2,6 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -32,10 +33,8 @@ plan tests => 10; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/36_search_order.t =================================================================== --- trunk/t/36_search_order.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/36_search_order.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -2,6 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -18,10 +19,8 @@ plan tests => 9; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/37_search_summaries.t =================================================================== --- trunk/t/37_search_summaries.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/37_search_summaries.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -2,6 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -13,10 +14,8 @@ plan tests => 2; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/38_search_params.t =================================================================== --- trunk/t/38_search_params.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/38_search_params.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -3,6 +3,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -32,10 +33,8 @@ plan tests => 19; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/39_search_form.t =================================================================== --- trunk/t/39_search_form.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/39_search_form.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -37,10 +37,8 @@ plan tests => 27; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: trunk/t/40_search_as_feed.t =================================================================== --- trunk/t/40_search_as_feed.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/40_search_as_feed.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,10 +13,8 @@ plan tests => 7; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -59,4 +57,4 @@ like($output, qr/<entry>/, "Really was Atom"); @found = ($output =~ /(<entry>)/g); -is( scalar @found, 1, "found right entries in feed" ); \ No newline at end of file +is( scalar @found, 1, "found right entries in feed" ); Modified: trunk/t/42_edit_conflict.t =================================================================== --- trunk/t/42_edit_conflict.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/42_edit_conflict.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -16,9 +16,9 @@ } plan tests => 16; +# clear out database + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); - # Make a guide that works on latitude/longitude, and allows node images. my $config = OpenGuides::Test->make_basic_config; $config->geo_handler( 3 ); @@ -27,11 +27,6 @@ my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} # Write some data. Modified: trunk/t/43_preview_edits.t =================================================================== --- trunk/t/43_preview_edits.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/43_preview_edits.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -18,9 +18,7 @@ plan tests => 1; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/44_node_image.t =================================================================== --- trunk/t/44_node_image.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/44_node_image.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -20,9 +20,7 @@ my ( $config, $guide, $wiki ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Make sure node image fields don't show up in edit form if config says # they shouldn't. Modified: trunk/t/45_home_recent_changes.t =================================================================== --- trunk/t/45_home_recent_changes.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/45_home_recent_changes.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -15,9 +15,7 @@ my ( $config, $guide, $wiki ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Write some data to show up in recent changes. $config = OpenGuides::Test->make_basic_config; Modified: trunk/t/46_map_in_node_display.t =================================================================== --- trunk/t/46_map_in_node_display.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/46_map_in_node_display.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -21,9 +21,7 @@ my ( $config, $guide, $wiki, $cookie, $output ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Make a guide. $config = OpenGuides::Test->make_basic_config; Modified: trunk/t/47_navbar_placement.t =================================================================== --- trunk/t/47_navbar_placement.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/47_navbar_placement.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -24,9 +24,7 @@ my ( $config, $guide, $wiki, $cookie, $output ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Make a guide. $config = OpenGuides::Test->make_basic_config; Modified: trunk/t/48_google_analytics.t =================================================================== --- trunk/t/48_google_analytics.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/48_google_analytics.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -15,9 +15,7 @@ my ( $config, $guide, $wiki, $cookie, $output ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Make a guide. $config = OpenGuides::Test->make_basic_config; Modified: trunk/t/49_custom_header.t =================================================================== --- trunk/t/49_custom_header.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/49_custom_header.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -24,10 +24,7 @@ my $wiki = $guide->wiki; # Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} + OpenGuides::Test::refresh_db(); # Make sure the tmp directory exists eval { Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/51_display_node.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -15,8 +15,8 @@ plan tests => 19; -Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/52_display_diffs.t =================================================================== --- trunk/t/52_display_diffs.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/52_display_diffs.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,16 +13,13 @@ plan tests => 5; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +# Clear out the database from any previous runs. + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} $wiki->write_node( "I Like Pie", "Best pie is meat pie." ) or die "Couldn't write node"; Modified: trunk/t/53_show_index.t =================================================================== --- trunk/t/53_show_index.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/53_show_index.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,7 +13,9 @@ plan tests => 23; # 25 when all enabled -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +# Clear out the database from any previous runs. + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -22,11 +24,6 @@ my $wiki = $guide->wiki; isa_ok( $wiki, "Wiki::Toolkit" ); -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} $wiki->write_node( "Test Page", "foo", undef, { category => "Alpha", latitude=>51.754349, longitude=>-1.258200 } ) Modified: trunk/t/54_redirect.t =================================================================== --- trunk/t/54_redirect.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/54_redirect.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -2,6 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -13,7 +14,6 @@ plan tests => 2; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -28,13 +28,11 @@ eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; + OpenGuides::Test::refresh_db(); + my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} $wiki->write_node( "Test Page", "#REDIRECT [[Test Page 2]]" ) or die "Can't write node"; Modified: trunk/t/55_node_history.t =================================================================== --- trunk/t/55_node_history.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/55_node_history.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; @@ -12,8 +13,8 @@ plan tests => 2; -Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->script_name( "mywiki.cgi" ); $config->script_url( "http://example.com/" ); Modified: trunk/t/56_diffs_with_macros.t =================================================================== --- trunk/t/56_diffs_with_macros.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/56_diffs_with_macros.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -14,9 +14,7 @@ plan tests => 4; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/57_random_page.t =================================================================== --- trunk/t/57_random_page.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/57_random_page.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -15,7 +15,8 @@ my ( $config, $guide, $wiki ); # Clear out database from previous runs, set up a guide. -refresh_db(); + OpenGuides::Test::refresh_db(); + $config = OpenGuides::Test->make_basic_config; $config->script_url( "http://www.example.com/" ); $config->script_name( "wiki.cgi" ); @@ -44,7 +45,8 @@ ok( $nodes{$node}, "...to an existing node" ); # Clear the database and write some data including categories and locales. -refresh_db(); + OpenGuides::Test::refresh_db(); + $config = OpenGuides::Test->make_basic_config; $config->script_url( "http://www.example.com/" ); $config->script_name( "wiki.cgi" ); @@ -87,7 +89,8 @@ . "(this test may sometimes pass when it shouldn't)" ); # Now make sure we can pick things up from specific categories/locales if asked -refresh_db(); + OpenGuides::Test::refresh_db(); + $config = OpenGuides::Test->make_basic_config; $guide = OpenGuides->new( config => $config ); @@ -143,11 +146,6 @@ unlike( $output, qr/Status: 302/, "don't get a redirect if we ask for category/locale with no pages in" ); -sub refresh_db { - unlink "t/node.db"; - unlink <t/indexes/*>; - Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); -} sub get_node_from_output { my $node_param = shift; Modified: trunk/t/58_navbar_common_locales_categories.t =================================================================== --- trunk/t/58_navbar_common_locales_categories.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/58_navbar_common_locales_categories.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -50,9 +50,7 @@ my ( $config, $guide, $wiki, $output ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); while (my ($page, $get_content) = each %pages) { Modified: trunk/t/59_preferences.t =================================================================== --- trunk/t/59_preferences.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/59_preferences.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; @@ -24,8 +25,8 @@ plan tests => 2; -Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/prefs.db" } ); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/prefs.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; Modified: trunk/t/61_bug_textareas.t =================================================================== --- trunk/t/61_bug_textareas.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/61_bug_textareas.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Template; use OpenGuides::Test; @@ -13,7 +14,8 @@ plan tests => 1; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); @@ -30,4 +32,4 @@ ); like( $out, qr/Barville\nFooville/, - "locales properly separated in textarea" ); \ No newline at end of file + "locales properly separated in textarea" ); Modified: trunk/t/62_bug_trailing_whitespace.t =================================================================== --- trunk/t/62_bug_trailing_whitespace.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/62_bug_trailing_whitespace.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; @@ -15,9 +16,7 @@ plan tests => 8; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/63_bug_map_link_no_address.t =================================================================== --- trunk/t/63_bug_map_link_no_address.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/63_bug_map_link_no_address.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; @@ -12,8 +13,8 @@ plan tests => 1; -Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/64_bug_node_history.t =================================================================== --- trunk/t/64_bug_node_history.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/64_bug_node_history.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use Cwd; @@ -2,2 +3,3 @@ use OpenGuides; +use OpenGuides::Test; use Test::More; @@ -13,8 +15,8 @@ plan tests => 1; -Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -39,4 +41,4 @@ id => "South Croydon Station", return_output => 1, ); -unlike( $output, qr'<myfaketag>', "HTML escaped in comments" ); \ No newline at end of file +unlike( $output, qr'<myfaketag>', "HTML escaped in comments" ); Modified: trunk/t/65_bug_metadata_escape.t =================================================================== --- trunk/t/65_bug_metadata_escape.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/65_bug_metadata_escape.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use Cwd; @@ -2,2 +3,3 @@ use OpenGuides; +use OpenGuides::Test; use Test::More; @@ -12,8 +14,8 @@ plan tests => 1; -Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -37,4 +39,4 @@ return_output => 1, ); unlike( $output, qr'<hr><h1>hello mum</h1><hr>', - "HTML escaped in metadata on node display" ); \ No newline at end of file + "HTML escaped in metadata on node display" ); Modified: trunk/t/66_bug_latlong_representation.t =================================================================== --- trunk/t/66_bug_latlong_representation.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/66_bug_latlong_representation.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -21,10 +21,8 @@ plan tests => 4; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/67_bug_first_version.t =================================================================== --- trunk/t/67_bug_first_version.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/67_bug_first_version.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; @@ -14,10 +15,9 @@ plan tests => 3; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); @@ -35,4 +35,4 @@ unlike( $output, qr|<a href=".*">diff</a>|, "no diff link displayed on node with only one version" ); unlike( $output, qr|<a href=".*">View current version.</a>|i, - "...nor view current version link" ); \ No newline at end of file + "...nor view current version link" ); Modified: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/68_bug_website_displayed.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; @@ -12,8 +13,8 @@ plan tests => 2; -Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/69_bug_zero_geo.t =================================================================== --- trunk/t/69_bug_zero_geo.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/69_bug_zero_geo.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -1,3 +1,4 @@ +use strict; use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use Cwd; @@ -13,8 +14,8 @@ plan tests => 6; -Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/70_admin_home.t =================================================================== --- trunk/t/70_admin_home.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/70_admin_home.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -12,7 +12,8 @@ plan tests => 12; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -21,11 +22,6 @@ my $wiki = $guide->wiki; isa_ok( $wiki, "Wiki::Toolkit" ); -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} # Add 3 different pages, one of which with two versions Modified: trunk/t/71_missing_metadata.t =================================================================== --- trunk/t/71_missing_metadata.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/71_missing_metadata.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -12,8 +12,8 @@ } plan tests => 26; + OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -22,11 +22,6 @@ my $wiki = $guide->wiki; isa_ok( $wiki, "Wiki::Toolkit" ); -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} # Add 3 different pages, one of which with two versions Modified: trunk/t/72_node_moderation.t =================================================================== --- trunk/t/72_node_moderation.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/72_node_moderation.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,7 +13,8 @@ plan tests => 19; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -22,11 +23,6 @@ my $wiki = $guide->wiki; isa_ok( $wiki, "Wiki::Toolkit" ); -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} # Add a page Modified: trunk/t/73_toggle_moderation.t =================================================================== --- trunk/t/73_toggle_moderation.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/73_toggle_moderation.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,7 +13,8 @@ plan tests => 14; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -22,11 +23,6 @@ my $wiki = $guide->wiki; isa_ok( $wiki, "Wiki::Toolkit" ); -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} # Add 3 different pages, one of which with two versions Modified: trunk/t/74_ping_plugin.t =================================================================== --- trunk/t/74_ping_plugin.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/74_ping_plugin.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -15,7 +15,8 @@ eval { require Wiki::Toolkit::Plugin::Ping; }; my $have_ping = $@ ? 0 : 1; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/75_revert_user.t =================================================================== --- trunk/t/75_revert_user.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/75_revert_user.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,7 +13,8 @@ plan tests => 23; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -22,11 +23,6 @@ my $wiki = $guide->wiki; isa_ok( $wiki, "Wiki::Toolkit" ); -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} my %details; my %vars; Modified: trunk/t/76_detect_spam.t =================================================================== --- trunk/t/76_detect_spam.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/76_detect_spam.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -14,9 +14,7 @@ plan tests => 2; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Set up a guide which uses a spam detector module. my $config = OpenGuides::Test->make_basic_config; Modified: trunk/t/79_host_blacklist.t =================================================================== --- trunk/t/79_host_blacklist.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/79_host_blacklist.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -14,9 +14,7 @@ plan tests => 1; # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Set up a guide which uses a spam detector module. my $config = OpenGuides::Test->make_basic_config; Modified: trunk/t/81_node_moderate_whitelist.t =================================================================== --- trunk/t/81_node_moderate_whitelist.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/81_node_moderate_whitelist.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -13,7 +13,8 @@ plan tests => 12; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -23,11 +24,6 @@ my $wiki = $guide->wiki; isa_ok( $wiki, "Wiki::Toolkit" ); -# Clear out the database from any previous runs. -foreach my $del_node ( $wiki->list_all_nodes ) { - print "# Deleting node $del_node\n"; - $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; -} # Add a page Modified: trunk/t/83_show_delete_to_admins_only.t =================================================================== --- trunk/t/83_show_delete_to_admins_only.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/83_show_delete_to_admins_only.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -49,9 +49,7 @@ my ( $config, $guide, $wiki, $output ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Make a guide Modified: trunk/t/84_navbar_admin.t =================================================================== --- trunk/t/84_navbar_admin.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/84_navbar_admin.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -49,9 +49,7 @@ my ( $config, $guide, $wiki, $output ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Make a guide Modified: trunk/t/85_universal_edit_link.t =================================================================== --- trunk/t/85_universal_edit_link.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/85_universal_edit_link.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -17,9 +17,7 @@ my ( $config, $guide, $wiki, $cookie, $output ); # Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + OpenGuides::Test::refresh_db(); # Make a guide. $config = OpenGuides::Test->make_basic_config; Modified: trunk/t/86_recent_changes.t =================================================================== --- trunk/t/86_recent_changes.t 2009-08-10 17:06:11 UTC (rev 1272) +++ trunk/t/86_recent_changes.t 2009-09-04 22:24:51 UTC (rev 1273) @@ -23,11 +23,9 @@ plan tests => 10; -# Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; +OpenGuides::Test::refresh_db(); -Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -138,7 +136,7 @@ # set show_minor_edits to 0. -my $cookie = OpenGuides::CGI->make_prefs_cookie( + $cookie = OpenGuides::CGI->make_prefs_cookie( config => $config, username => "bob", include_geocache_link => 1,

1 0

r1272 - in trunk: . t
by svnadmin＠urchin.earth.li 10 Aug '09

10 Aug '09

Author: dom Date: 2009-08-10 18:06:11 +0100 (Mon, 10 Aug 2009) New Revision: 1272 Added: trunk/t/86_recent_changes.t Modified: trunk/Changes trunk/MANIFEST Log: Add test (references #270) Modified: trunk/Changes =================================================================== --- trunk/Changes 2009-06-19 23:12:21 UTC (rev 1271) +++ trunk/Changes 2009-08-10 17:06:11 UTC (rev 1272) @@ -7,6 +7,7 @@ Fix some more broken POD and add POD unit test (#268) Don't display revision info for nodes that don't exist (#193) Return HTTP 404 status when displaying a node that doens't exist (#102) + Add Recent Changes tests (refers to #270) 0.64 23 February 2009 Correctly specify all build_requires (#245) Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2009-06-19 23:12:21 UTC (rev 1271) +++ trunk/MANIFEST 2009-08-10 17:06:11 UTC (rev 1272) @@ -151,5 +151,6 @@ t/83_show_delete_to_admins_only.t t/84_navbar_admin.t t/85_universal_edit_link.t +t/86_recent_changes.t t/templates/15_test.tt wiki.cgi Added: trunk/t/86_recent_changes.t =================================================================== --- trunk/t/86_recent_changes.t (rev 0) +++ trunk/t/86_recent_changes.t 2009-08-10 17:06:11 UTC (rev 1272) @@ -0,0 +1,162 @@ +use strict; +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides::Config; +use OpenGuides; +use OpenGuides::Feed; +use OpenGuides::Utils; +use OpenGuides::Test; +use Test::More; +use OpenGuides::CGI; + + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; +} + +eval { require Wiki::Toolkit::Search::Plucene; }; +if ( $@ ) { + plan skip_all => "Plucene not installed"; +} + + +plan tests => 10; + +# Clear out the database from any previous runs. +unlink "t/node.db"; +unlink <t/indexes/*>; + +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +my $config = OpenGuides::Config->new( + vars => { + dbtype => "sqlite", + dbname => "t/node.db", + indexing_directory => "t/indexes", + script_name => "wiki.cgi", + script_url => "http://example.com/", + site_name => "Test Site", + template_path => "./templates", + home_name => "Home", + use_plucene => 1 + } +); + +# Basic sanity check first. +my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); + +my $feed = OpenGuides::Feed->new( wiki => $wiki, + config => $config ); + + +# Write the first version +my $guide = OpenGuides->new( config => $config ); + +# Set up CGI parameters ready for a node write. +my $q = OpenGuides::Test->make_cgi_object( + content => "foo", + username => "bob", + comment => "First edit", + node_image => "image", + edit_type => "Normal edit", +); + +my $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + +# Check we have it +ok( $wiki->node_exists( "Wombats" ), "Wombats written" ); + +my %node = $wiki->retrieve_node("Wombats"); +is( $node{version}, 1, "First version" ); + + +# Now write a second version of it +$q->param( -name => "edit_type", -value => "Normal edit" ); +$q->param( -name => "checksum", -value => $node{checksum} ); +$q->param( -name => "comment", -value => "Second edit" ); +$output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + +# Check it's as expected +%node = $wiki->retrieve_node("Wombats"); +is( $node{version}, 2, "First version" ); +is( $node{metadata}->{edit_type}[0], "Normal edit", "Right edit type" ); + +# Now try to commit some invalid data, and make sure we get an edit form back +$q = OpenGuides::Test->make_cgi_object( + content => "foo", + os_x => "fooooo", + username => "bob", + comment => "bar", + node_image => "image", + edit_type => "Minor tidying" +); + +$output = $guide->commit_node( + return_output => 1, + id => "Wombats again", + cgi_obj => $q, + ); + +like( $output, qr/Your input was invalid/, + "Edit form displayed and invalid input message shown if invalid input" ); + +like( $output, qr/os_x must be integer/, + "Edit form displayed and os_x integer message displayed" ); + +my @nodes = $wiki->list_recent_changes( days => 1 ); + is( scalar @nodes, 1, + "By default each node returned only once however many times changed" ); + @nodes = $wiki->list_recent_changes( days => 1, include_all_changes => 1 ); + is( scalar @nodes, 2, + "...returned more than once when 'include_all_changes' set" ); + +# when minor_edits = 1 + +my $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + username => "bob", + include_geocache_link => 1, + preview_above_edit_box => 1, + omit_help_links => 1, + show_minor_edits_in_rc => 1, + default_edit_type => "tidying", + cookie_expires => "never", + track_recent_changes_views => 1, + is_admin => 1, +); +$output = $guide->display_recent_changes( return_output => 1 ); + +unlike ($output, qr/First edit/, "showing a page edit twice when show minor edits enabled. "); + + +# set show_minor_edits to 0. +my $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + username => "bob", + include_geocache_link => 1, + preview_above_edit_box => 1, + omit_help_links => 1, + show_minor_edits_in_rc => 0, + default_edit_type => "tidying", + cookie_expires => "never", + track_recent_changes_views => 1, + is_admin => 1, +); +$ENV{HTTP_COOKIE} = $cookie; + + + +$output = $guide->display_recent_changes( return_output => 1 ); + +TODO: { + local $TODO = "http://dev.openguides.org/ticket/270"; + unlike ($output, qr/First edit/, "showing a page edit twice when not showing minor edits"); +}

1 0

r1271 - in trunk: . lib t
by svnadmin＠urchin.earth.li 20 Jun '09

20 Jun '09

Author: dom Date: 2009-06-20 00:12:21 +0100 (Sat, 20 Jun 2009) New Revision: 1271 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/t/51_display_node.t Log: Return HTTP 404 status when displaying a node that doens't exist (fixes #102) Modified: trunk/Changes =================================================================== --- trunk/Changes 2009-06-19 22:55:19 UTC (rev 1270) +++ trunk/Changes 2009-06-19 23:12:21 UTC (rev 1271) @@ -6,6 +6,7 @@ 0.65 Fix some more broken POD and add POD unit test (#268) Don't display revision info for nodes that don't exist (#193) + Return HTTP 404 status when displaying a node that doens't exist (#102) 0.64 23 February 2009 Correctly specify all build_requires (#245) Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2009-06-19 22:55:19 UTC (rev 1270) +++ trunk/lib/OpenGuides.pm 2009-06-19 23:12:21 UTC (rev 1271) @@ -273,6 +273,8 @@ metadata => $node_data{metadata} ); + my $node_exists = $wiki->node_exists($id); + my $http_status = $node_exists ? undef : '404 Not Found'; %tt_vars = ( %tt_vars, %metadata_vars, @@ -286,7 +288,7 @@ enable_gmaps => 1, wgs84_long => $wgs84_long, wgs84_lat => $wgs84_lat, - empty_node => !$wiki->node_exists($id) + empty_node => !$node_exists ); # Hide from search engines if showing a specific version. @@ -308,6 +310,7 @@ id => $id, template => "node.tt", tt_vars => \%tt_vars, + http_status => $http_status ); return $output if $return_output; print $output; @@ -363,6 +366,7 @@ id => $id, template => "home_node.tt", tt_vars => \%tt_vars, + http_status => $http_status ); return $output if $return_output; print $output; @@ -372,6 +376,7 @@ id => $id, template => "node.tt", tt_vars => \%tt_vars, + http_status => $http_status ); return $output if $return_output; print $output; @@ -2251,12 +2256,13 @@ sub process_template { my ($self, %args) = @_; my %output_conf = ( - wiki => $self->wiki, - config => $self->config, - node => $args{id}, - template => $args{template}, - vars => $args{tt_vars}, - cookies => $args{cookies}, + wiki => $self->wiki, + config => $self->config, + node => $args{id}, + template => $args{template}, + vars => $args{tt_vars}, + cookies => $args{cookies}, + http_status => $args{http_status} ); if ( $args{content_type} ) { $output_conf{content_type} = $args{content_type}; Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2009-06-19 22:55:19 UTC (rev 1270) +++ trunk/t/51_display_node.t 2009-06-19 23:12:21 UTC (rev 1271) @@ -13,7 +13,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 18; +plan tests => 19; Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); @@ -120,3 +120,4 @@ "bogus revision number doesn't show up" ); unlike( $output, qr{\QLast edited}, "bogus last edited doesn't show up" ); +like ( $output, qr{404 Not Found}, "404 status for empty node" );

1 0

r1270 - trunk/lib
by svnadmin＠urchin.earth.li 19 Jun '09

19 Jun '09

Author: dom Date: 2009-06-19 23:55:19 +0100 (Fri, 19 Jun 2009) New Revision: 1270 Modified: trunk/lib/OpenGuides.pm Log: less hacky determination of empty node Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2009-06-19 22:41:38 UTC (rev 1269) +++ trunk/lib/OpenGuides.pm 2009-06-19 22:55:19 UTC (rev 1270) @@ -285,15 +285,10 @@ oldid => $oldid, enable_gmaps => 1, wgs84_long => $wgs84_long, - wgs84_lat => $wgs84_lat + wgs84_lat => $wgs84_lat, + empty_node => !$wiki->node_exists($id) ); - $tt_vars{empty_node} = !($tt_vars{content} || - $tt_vars{coord_field_1_value} || - $tt_vars{coord_field_2_value} || - $tt_vars{latitude} || - $tt_vars{longitude}); - # Hide from search engines if showing a specific version. $tt_vars{'deter_robots'} = 1 if $args{version};

1 0

r1269 - in trunk: . lib t templates
by svnadmin＠urchin.earth.li 19 Jun '09

19 Jun '09

Author: dom Date: 2009-06-19 23:41:38 +0100 (Fri, 19 Jun 2009) New Revision: 1269 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/t/51_display_node.t trunk/templates/navbar.tt trunk/templates/node.tt Log: Don't display revision info for nodes that don't exist (fixes #193) Modified: trunk/Changes =================================================================== --- trunk/Changes 2009-04-12 07:34:29 UTC (rev 1268) +++ trunk/Changes 2009-06-19 22:41:38 UTC (rev 1269) @@ -5,6 +5,7 @@ 0.65 Fix some more broken POD and add POD unit test (#268) + Don't display revision info for nodes that don't exist (#193) 0.64 23 February 2009 Correctly specify all build_requires (#245) Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2009-04-12 07:34:29 UTC (rev 1268) +++ trunk/lib/OpenGuides.pm 2009-06-19 22:41:38 UTC (rev 1269) @@ -288,6 +288,12 @@ wgs84_lat => $wgs84_lat ); + $tt_vars{empty_node} = !($tt_vars{content} || + $tt_vars{coord_field_1_value} || + $tt_vars{coord_field_2_value} || + $tt_vars{latitude} || + $tt_vars{longitude}); + # Hide from search engines if showing a specific version. $tt_vars{'deter_robots'} = 1 if $args{version}; Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2009-04-12 07:34:29 UTC (rev 1268) +++ trunk/t/51_display_node.t 2009-06-19 22:41:38 UTC (rev 1269) @@ -13,7 +13,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 15; +plan tests => 18; Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); @@ -110,3 +110,13 @@ "wrongly-cased categories are linked as they should be" ); like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Exist"}, "wrongly-cased locales are linked as they should be" ); + +$output = $guide->display_node( id => "Does not exist", + return_output => 1 + ); +like( $output, qr{\QWe don't have a node called "Does not exist".}, + "not found message shows up" ); +unlike( $output, qr{\QRevision 0}, + "bogus revision number doesn't show up" ); +unlike( $output, qr{\QLast edited}, + "bogus last edited doesn't show up" ); Modified: trunk/templates/navbar.tt =================================================================== --- trunk/templates/navbar.tt 2009-04-12 07:34:29 UTC (rev 1268) +++ trunk/templates/navbar.tt 2009-06-19 22:41:38 UTC (rev 1269) @@ -12,7 +12,9 @@ [% INCLUDE navbar_categories.tt %] [% INCLUDE navbar_locales.tt %] </div> +[% UNLESS empty_node %] [% INCLUDE navbar_revision_info.tt %] +[% END %] </div> </div> Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2009-04-12 07:34:29 UTC (rev 1268) +++ trunk/templates/node.tt 2009-06-19 22:41:38 UTC (rev 1269) @@ -68,7 +68,7 @@ <span class="node_name">[% node_name %]</span></em> </h2> [% END %] -[% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %] +[% IF empty_node %] </div> <div id="nonexistent_node_message">We don't have a node called "[% node_name %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>?</div> [% ELSE %]

1 0

r1268 - sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin
by svnadmin＠urchin.earth.li 12 Apr '09

12 Apr '09

Author: dom Date: 2009-04-12 08:34:29 +0100 (Sun, 12 Apr 2009) New Revision: 1268 Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm Log: don't be an idiot Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm =================================================================== --- sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2009-04-12 07:31:14 UTC (rev 1267) +++ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2009-04-12 07:34:29 UTC (rev 1268) @@ -14,9 +14,9 @@ use MIME::Lite; sub notify_admins { + my ( $class, %args ) = @_; print STDERR "Akismet deny:\n" . Dumper( \%args ); return; - my ( $class, %args ) = @_; my $message = MIME::Lite->new( From => $args{email}, To => $args{email},

1 0

r1267 - sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin
by svnadmin＠urchin.earth.li 12 Apr '09

12 Apr '09

Author: dom Date: 2009-04-12 08:31:14 +0100 (Sun, 12 Apr 2009) New Revision: 1267 Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm Log: don't send emails any more; being overwhelmed Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm =================================================================== --- sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2009-03-15 22:27:03 UTC (rev 1266) +++ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2009-04-12 07:31:14 UTC (rev 1267) @@ -14,6 +14,8 @@ use MIME::Lite; sub notify_admins { + print STDERR "Akismet deny:\n" . Dumper( \%args ); + return; my ( $class, %args ) = @_; my $message = MIME::Lite->new( From => $args{email},

1 0

r1266 - in sites/london.openguides.org: . static static/graphics static/resources
by svnadmin＠urchin.earth.li 15 Mar '09

15 Mar '09

Author: dom Date: 2009-03-15 22:27:03 +0000 (Sun, 15 Mar 2009) New Revision: 1266 Added: sites/london.openguides.org/static/ sites/london.openguides.org/static/favicon.ico sites/london.openguides.org/static/graphics/ sites/london.openguides.org/static/graphics/feed.png sites/london.openguides.org/static/graphics/logo.jpg sites/london.openguides.org/static/graphics/logo_2005_a.jpg sites/london.openguides.org/static/graphics/logo_2005_a.png sites/london.openguides.org/static/graphics/logo_2005_b.jpg sites/london.openguides.org/static/graphics/logo_old.jpg sites/london.openguides.org/static/graphics/rdf.png sites/london.openguides.org/static/index.html sites/london.openguides.org/static/logo.jpg sites/london.openguides.org/static/resources/ sites/london.openguides.org/static/resources/ogl.css sites/london.openguides.org/static/resources/somerights20.gif Log: add static content Added: sites/london.openguides.org/static/favicon.ico =================================================================== (Binary files differ) Property changes on: sites/london.openguides.org/static/favicon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: sites/london.openguides.org/static/graphics/feed.png =================================================================== (Binary files differ) Property changes on: sites/london.openguides.org/static/graphics/feed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: sites/london.openguides.org/static/graphics/logo.jpg =================================================================== --- sites/london.openguides.org/static/graphics/logo.jpg (rev 0) +++ sites/london.openguides.org/static/graphics/logo.jpg 2009-03-15 22:27:03 UTC (rev 1266) @@ -0,0 +1 @@ +link logo_2005_b.jpg \ No newline at end of file Property changes on: sites/london.openguides.org/static/graphics/logo.jpg ___________________________________________________________________ Name: svn:special + * Added: sites/london.openguides.org/static/graphics/logo_2005_a.jpg =================================================================== (Binary files differ) Property changes on: sites/london.openguides.org/static/graphics/logo_2005_a.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: sites/london.openguides.org/static/graphics/logo_2005_a.png =================================================================== (Binary files differ) Property changes on: sites/london.openguides.org/static/graphics/logo_2005_a.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: sites/london.openguides.org/static/graphics/logo_2005_b.jpg =================================================================== (Binary files differ) Property changes on: sites/london.openguides.org/static/graphics/logo_2005_b.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: sites/london.openguides.org/static/graphics/logo_old.jpg =================================================================== (Binary files differ) Property changes on: sites/london.openguides.org/static/graphics/logo_old.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: sites/london.openguides.org/static/graphics/rdf.png =================================================================== (Binary files differ) Property changes on: sites/london.openguides.org/static/graphics/rdf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: sites/london.openguides.org/static/index.html =================================================================== --- sites/london.openguides.org/static/index.html (rev 0) +++ sites/london.openguides.org/static/index.html 2009-03-15 22:27:03 UTC (rev 1266) @@ -0,0 +1,9 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" + "http://www.w3.org/TR/REC-html40/loose.dtd"> + +<html> +<head><title>Not here yet</title></head> +<body> +<h2>Not here yet</h2> +<p>This is the web server for london.openguides.org. This site has been configured, but no content has arrived yet.</p> +</body></html> Added: sites/london.openguides.org/static/logo.jpg =================================================================== --- sites/london.openguides.org/static/logo.jpg (rev 0) +++ sites/london.openguides.org/static/logo.jpg 2009-03-15 22:27:03 UTC (rev 1266) @@ -0,0 +1 @@ +link graphics/logo.jpg \ No newline at end of file Property changes on: sites/london.openguides.org/static/logo.jpg ___________________________________________________________________ Name: svn:special + * Added: sites/london.openguides.org/static/resources/ogl.css =================================================================== --- sites/london.openguides.org/static/resources/ogl.css (rev 0) +++ sites/london.openguides.org/static/resources/ogl.css 2009-03-15 22:27:03 UTC (rev 1266) @@ -0,0 +1,185 @@ +body { + margin: 0px; +} + +a { + color: #060; +} + +a img { + border: 0px; +} + +body, div, p, td, input, select { + font-family: georgia, "times new roman", serif; + font-size: 12px; + line-height: 1.4em; +} + +p { + margin: 0em; +} + +p + p { + text-indent: 1.5em; +} + +h2.node_name { + line-height: 1.1em; + font-size: 2em; +} + +.hidden { + display: none; +} + +#redirect_message { + font-size: 0.9em; + font-style: italic; +} + +#recent, #navbar_parent { + width: 20%; + float: right; + margin: 1em 0em 0em 0em; + padding: 0em 1em 1em 2em; + border-left: 1px dashed #ccc; +} + +#recent h3 { + margin: 0px; +} + +#recent a, #navbar_parent a { + text-decoration: none; + border-bottom: 1px solid #ddd; +} + +#title_edit_link { + width: 20%; + float: right; +} + +#title_edit_link a { + background: #eee; + color: #000; + text-decoration: none; + border-left: 1px solid #ddd; + border-top: 1px solid #ddd; + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; + padding: 0.5em; +} + +#version { + display: none; +} + +#rdf_link { + font-size: 0.9em; + float: right; + margin: 1em 0em; +} + +#rdf_link a { + text-decoration: none; + border-bottom: 1px solid #ddd; +} + +.navbar_site_name { + display: none; +} + +#navbar_parent ul { + list-style-type: none; + color: #999; +} + +/* 00BB is the ">>" symbol */ + +#navbar_parent ul li:before { + content: "\2767 \0020"; +} + +#navbar_tools ul, #navbar_help ul, #navbar_options ul, + +#navbar_search ul, #navbar_this_page ul, #navbar_starting_points ul { + margin: 0em 0em 1em 0em; + padding: 0em; +} + +#navbar_tools ul li, #navbar_help ul li, #navbar_options ul li, +#navbar_search ul li, #navbar_this_page ul li, #navbar_starting_points ul li { + margin-left: 1em; +} + + +#banner { + background: url(http://london.openguides.org/graphics/logo.jpg) no-repeat #fff; + height: 75px; + width: 100%; + border-bottom: 1px solid #ccc; + cursor: pointer; +} + +#banner h1 { + display: none; +} + +#maincontent ul { + list-style-type: circle; +} + +#content, #maincontent { + padding: 1em; +} + +#content #maincontent { + padding: 0em; + width: 60%; + float: left; + margin: 0em 0em 2em 5em; +} + +#content #footer { + padding: 1em 0em 0em 0em; +} + +#footer { + margin-top: 1em; + border-top: 1px solid #ccc; + padding: 1em; +} + +#adsense { + margin: 3em auto 0em auto; +} + +#openguides_information { + border: 4px dashed #ccc; + margin: 2em 0em; + padding: 1em; +} + +.edit_form_actions { + text-align: center; + margin: 1em 0em; +} + +.edit_form_actions div { + display: inline; +} + +.edit_form_group label { + font-weight: bold; +} + +legend { + padding: 0em 1em; + font-size: 1.1em; + font-weight: bold; +} + +.edit_form_group input[type=text], .edit_form_group textarea { + width: 100%; +} \ No newline at end of file Added: sites/london.openguides.org/static/resources/somerights20.gif =================================================================== (Binary files differ) Property changes on: sites/london.openguides.org/static/resources/somerights20.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r1265 - website/publish/includes
by svnadmin＠urchin.earth.li 15 Mar '09

15 Mar '09

Author: dom Date: 2009-03-15 22:23:22 +0000 (Sun, 15 Mar 2009) New Revision: 1265 Modified: website/publish/includes/footer.inc Log: merge to publish Modified: website/publish/includes/footer.inc =================================================================== --- website/publish/includes/footer.inc 2009-03-15 22:21:55 UTC (rev 1264) +++ website/publish/includes/footer.inc 2009-03-15 22:23:22 UTC (rev 1265) @@ -16,9 +16,10 @@ <div id="trademarks"> <em>OpenGuides</em>, <em>[The] Open Guide to...</em> and <em>the guides made by you</em> are - trademarks of The OpenGuides Project, copyright ©2002-2006. All rights + trademarks of The OpenGuides Project, copyright ©2002-2009. All rights reserved.<br> Trademarks used on member sites of the OpenGuides network by permission. + Contact: <a href="mailto:contact@openguides.org">contact(a)openguides.org</a> </div>

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits