Merge lp:~kfader/mvhub/pages.t-too-slow into lp:mvhub
- pages.t-too-slow
- Merge into trunk_2format
Proposed by
Keith Fader
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 512 | ||||||||
| Proposed branch: | lp:~kfader/mvhub/pages.t-too-slow | ||||||||
| Merge into: | lp:mvhub | ||||||||
| Diff against target: |
448 lines (+99/-33) 6 files modified
app-mvhub/t/bugs/admin_logout_bug.t (+2/-2) app-mvhub/t/bugs/categorize_link_missing_when_agency_login.t (+6/-8) app-mvhub/t/bugs/ql_display_agency_home_interaction.t (+4/-3) app-mvhub/t/bugs/ql_works_after_admin_login.t (+3/-3) app-mvhub/t/mech/pages.t (+53/-17) lib-mvhub/t/lib/TestHelper.pm (+31/-0) |
||||||||
| To merge this branch: | bzr merge lp:~kfader/mvhub/pages.t-too-slow | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dan MacNeil | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
See commit log.
To post a comment you must log in.
Revision history for this message
| Dan MacNeil (omacneil) wrote : | # |
A few problems:
You take out all the:
$mech->get( $$page{url}
..so the tests are all invalid, they test a mech object that doesn't contain a page. We save a lot of time by not traveling over the network to fetch a web page, but we cant test the links or the validity of the html if we don't have the page.
perl objects are references, roughly akin to pointers.
So you assign a pointer to the same thing to each mech object in the @pages array.
if a is pointer that points to address 33558 and you say a=b then b also points to address 33558
To help see these problems paste this code into main at some point.
foreach my $page_href (@total_pages){
my $mech=$
print "mech object is:",$$
}
;
exit 0;
One patial solution would be to create a new() object in your add_mech_objects() sub and to call $mech->get( $$page{url} in that sub.
review:
Needs Fixing
- 504. By Keith Fader
-
Modified these files to initialize mech objects correctly. TestHelper will now grab the mech objects out of the pages hash, for consistency.
- 505. By Keith Fader
-
Fixed add_mech_objects to initialize new mech object each time. Modified TestHelper to use cached mech objects for consistency
Revision history for this message
| Dan MacNeil (omacneil) wrote : | # |
39 + #TestHelper:
On general principles, you shouldn't submit commented out code for merge request.
It adds noise, With version control you can get it back
review:
Needs Fixing
Revision history for this message
| Dan MacNeil (omacneil) wrote : | # |
tests fail.
Before submitting merge request, all should pass
run them with:
mv_prove -r app-mvhub/t lib-mvhub/t
app-mvhub/
...and anything that uses TestHelper:
sub routine was in a library for a reason...
Need to either add caching to routine (quick little & little ugly) or change every test file that uses it.
review:
Needs Fixing
- 506. By Keith Fader
-
Reverted TestHelper.pm. There was no need to change it in the first
place. Ran perltidy on pages.t. All tests pass, speed is good. - 507. By Keith Fader
-
Changes from two weeks ago.
- 508. By Keith Fader
-
merged trunk
Revision history for this message
| Dan MacNeil (omacneil) wrote : | # |
in pages.t
sub add_mech_objects {
... is never called.
review:
Needs Fixing
Revision history for this message
| Dan MacNeil (omacneil) wrote : | # |
8 - my $mech = shift or die 'pages_get_ok() missing param: $mech';
9 - my @pages = @_ or die 'pages_get_ok() missing param: @pages';
10 + my $mech = shift or die 'run_tests() missing param: $mech';
11 + my @pages = @_ or die 'run_tests() missing param: @pages';
Good in passing fix, closer to perfect would be to mention in commit log
Revision history for this message
| Dan MacNeil (omacneil) wrote : | # |
Otherwise good.
Revision history for this message
| Dan MacNeil (omacneil) wrote : | # |
merge fairy will remove the kruft.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'app-mvhub/t/bugs/admin_logout_bug.t' | |||
| 2 | --- app-mvhub/t/bugs/admin_logout_bug.t 2010-09-27 13:28:16 +0000 | |||
| 3 | +++ app-mvhub/t/bugs/admin_logout_bug.t 2010-10-29 19:42:40 +0000 | |||
| 4 | @@ -45,8 +45,8 @@ | |||
| 5 | 45 | use Test::Harness; | 45 | use Test::Harness; |
| 6 | 46 | 46 | ||
| 7 | 47 | sub run_tests { | 47 | sub run_tests { |
| 10 | 48 | my $mech = shift or die 'pages_get_ok() missing param: $mech'; | 48 | my $mech = shift or die 'run_tests() missing param: $mech'; |
| 11 | 49 | my @pages = @_ or die 'pages_get_ok() missing param: @pages'; | 49 | my @pages = @_ or die 'run_tests() missing param: @pages'; |
| 12 | 50 | 50 | ||
| 13 | 51 | foreach my $page (@pages) { | 51 | foreach my $page (@pages) { |
| 14 | 52 | $mech->add_header( Authorization => $$page{auth} ) | 52 | $mech->add_header( Authorization => $$page{auth} ) |
| 15 | 53 | 53 | ||
| 16 | === modified file 'app-mvhub/t/bugs/categorize_link_missing_when_agency_login.t' | |||
| 17 | --- app-mvhub/t/bugs/categorize_link_missing_when_agency_login.t 2010-09-27 13:28:16 +0000 | |||
| 18 | +++ app-mvhub/t/bugs/categorize_link_missing_when_agency_login.t 2010-10-29 19:42:40 +0000 | |||
| 19 | @@ -22,11 +22,9 @@ | |||
| 20 | 22 | my $number_of_tests = ( ( scalar @pages ) * 4 ); | 22 | my $number_of_tests = ( ( scalar @pages ) * 4 ); |
| 21 | 23 | 23 | ||
| 22 | 24 | plan tests => $number_of_tests; | 24 | plan tests => $number_of_tests; |
| 23 | 25 | my $mech = Test::WWW::Mechanize->new(); | ||
| 24 | 26 | $mech->default_header( Authorization => TestHelper::create_temp_auth() ); | ||
| 25 | 27 | 25 | ||
| 28 | 28 | TestHelper::pages_get_ok( $mech, @pages ); | 26 | TestHelper::pages_add_ok(@pages); |
| 29 | 29 | check_for_categorize_link( $mech, @pages ); | 27 | check_for_categorize_link(@pages); |
| 30 | 30 | } # main | 28 | } # main |
| 31 | 31 | 29 | ||
| 32 | 32 | sub init_pages { | 30 | sub init_pages { |
| 33 | @@ -45,17 +43,17 @@ | |||
| 34 | 45 | "Agency Account Home Page - North Shore Community Action Programs", | 43 | "Agency Account Home Page - North Shore Community Action Programs", |
| 35 | 46 | 'tests_to_skip' => '', | 44 | 'tests_to_skip' => '', |
| 36 | 47 | 'todo_reason' => 'Need to fix diplay agency home page', | 45 | 'todo_reason' => 'Need to fix diplay agency home page', |
| 37 | 46 | 'mech' => undef, | ||
| 38 | 48 | }, | 47 | }, |
| 39 | 49 | ); | 48 | ); |
| 40 | 50 | return @pages; | 49 | return @pages; |
| 41 | 51 | } | 50 | } |
| 42 | 52 | 51 | ||
| 43 | 53 | sub check_for_categorize_link { | 52 | sub check_for_categorize_link { |
| 47 | 54 | my $mech = shift or die 'page_links_ok() missing param: $mech'; | 53 | my @pages = @_ or die 'page_links_ok() missing param: @pages'; |
| 48 | 55 | my @pages = @_ or die 'page_links_ok() missing param: @pages'; | 54 | my $mech; |
| 46 | 56 | |||
| 49 | 57 | foreach my $page (@pages) { | 55 | foreach my $page (@pages) { |
| 51 | 58 | $mech->get( $$page{url} ); | 56 | $mech = $$page{mech}; |
| 52 | 59 | ok( $mech->find_link( text => 'categorize' ), | 57 | ok( $mech->find_link( text => 'categorize' ), |
| 53 | 60 | "Found categorize link on the page" | 58 | "Found categorize link on the page" |
| 54 | 61 | ); | 59 | ); |
| 55 | 62 | 60 | ||
| 56 | === modified file 'app-mvhub/t/bugs/ql_display_agency_home_interaction.t' | |||
| 57 | --- app-mvhub/t/bugs/ql_display_agency_home_interaction.t 2010-09-27 13:28:16 +0000 | |||
| 58 | +++ app-mvhub/t/bugs/ql_display_agency_home_interaction.t 2010-10-29 19:42:40 +0000 | |||
| 59 | @@ -22,10 +22,8 @@ | |||
| 60 | 22 | my $number_of_tests = ( ( scalar @pages ) * 3 ); | 22 | my $number_of_tests = ( ( scalar @pages ) * 3 ); |
| 61 | 23 | 23 | ||
| 62 | 24 | plan tests => $number_of_tests; | 24 | plan tests => $number_of_tests; |
| 63 | 25 | my $mech = Test::WWW::Mechanize->new(); | ||
| 64 | 26 | $mech->default_header( Authorization => TestHelper::create_temp_auth() ); | ||
| 65 | 27 | 25 | ||
| 67 | 28 | TestHelper::pages_get_ok( $mech, @pages ); | 26 | TestHelper::pages_add_ok(@pages); |
| 68 | 29 | 27 | ||
| 69 | 30 | } # main | 28 | } # main |
| 70 | 31 | 29 | ||
| 71 | @@ -44,6 +42,7 @@ | |||
| 72 | 44 | "Agency Account Home Page - North Shore Community Action Programs", | 42 | "Agency Account Home Page - North Shore Community Action Programs", |
| 73 | 45 | 'tests_to_skip' => '', | 43 | 'tests_to_skip' => '', |
| 74 | 46 | 'skip_reason' => '', | 44 | 'skip_reason' => '', |
| 75 | 45 | 'mech' => undef | ||
| 76 | 47 | }, | 46 | }, |
| 77 | 48 | 47 | ||
| 78 | 49 | { 'url' => | 48 | { 'url' => |
| 79 | @@ -51,6 +50,7 @@ | |||
| 80 | 51 | 'expected_content' => "You must log in to access this page", | 50 | 'expected_content' => "You must log in to access this page", |
| 81 | 52 | 'tests_to_skip' => '', | 51 | 'tests_to_skip' => '', |
| 82 | 53 | 'skip_reason' => '', | 52 | 'skip_reason' => '', |
| 83 | 53 | 'mech' => undef | ||
| 84 | 54 | }, | 54 | }, |
| 85 | 55 | 55 | ||
| 86 | 56 | { 'url' => | 56 | { 'url' => |
| 87 | @@ -58,6 +58,7 @@ | |||
| 88 | 58 | 'expected_content' => "Transitions", | 58 | 'expected_content' => "Transitions", |
| 89 | 59 | 'tests_to_skip' => '', | 59 | 'tests_to_skip' => '', |
| 90 | 60 | 'skip_reason' => '', | 60 | 'skip_reason' => '', |
| 91 | 61 | 'mech' => undef | ||
| 92 | 61 | }, | 62 | }, |
| 93 | 62 | 63 | ||
| 94 | 63 | ); | 64 | ); |
| 95 | 64 | 65 | ||
| 96 | === modified file 'app-mvhub/t/bugs/ql_works_after_admin_login.t' | |||
| 97 | --- app-mvhub/t/bugs/ql_works_after_admin_login.t 2010-09-13 00:58:44 +0000 | |||
| 98 | +++ app-mvhub/t/bugs/ql_works_after_admin_login.t 2010-10-29 19:42:40 +0000 | |||
| 99 | @@ -25,10 +25,8 @@ | |||
| 100 | 25 | my $number_of_tests = ( ( scalar @pages ) * 3 ); | 25 | my $number_of_tests = ( ( scalar @pages ) * 3 ); |
| 101 | 26 | 26 | ||
| 102 | 27 | plan tests => $number_of_tests; | 27 | plan tests => $number_of_tests; |
| 103 | 28 | my $mech = Test::WWW::Mechanize->new(); | ||
| 104 | 29 | $mech->default_header( Authorization => TestHelper::create_temp_auth() ); | ||
| 105 | 30 | 28 | ||
| 107 | 31 | TestHelper::pages_get_ok( $mech, @pages ); | 29 | TestHelper::pages_add_ok(@pages); |
| 108 | 32 | } # main | 30 | } # main |
| 109 | 33 | 31 | ||
| 110 | 34 | sub init_pages { | 32 | sub init_pages { |
| 111 | @@ -43,6 +41,7 @@ | |||
| 112 | 43 | 'expected_content' => "Welcome to the Administrative Home Page", | 41 | 'expected_content' => "Welcome to the Administrative Home Page", |
| 113 | 44 | 'tests_to_skip' => '', | 42 | 'tests_to_skip' => '', |
| 114 | 45 | 'skip_reason' => '', | 43 | 'skip_reason' => '', |
| 115 | 44 | 'mech' => undef, | ||
| 116 | 46 | }, | 45 | }, |
| 117 | 47 | { 'url' => | 46 | { 'url' => |
| 118 | 48 | "http://$host/cgi-bin/mvhub/agency.pl?rm=ql&aid=$agency_id&qlid=$quick_login_id", | 47 | "http://$host/cgi-bin/mvhub/agency.pl?rm=ql&aid=$agency_id&qlid=$quick_login_id", |
| 119 | @@ -50,6 +49,7 @@ | |||
| 120 | 50 | "Agency Account Home Page - North Shore Community Action Programs", | 49 | "Agency Account Home Page - North Shore Community Action Programs", |
| 121 | 51 | 'tests_to_skip' => '', | 50 | 'tests_to_skip' => '', |
| 122 | 52 | 'skip_reason' => '', | 51 | 'skip_reason' => '', |
| 123 | 52 | 'mech' => undef, | ||
| 124 | 53 | }, | 53 | }, |
| 125 | 54 | 54 | ||
| 126 | 55 | ); | 55 | ); |
| 127 | 56 | 56 | ||
| 128 | === modified file 'app-mvhub/t/mech/pages.t' | |||
| 129 | --- app-mvhub/t/mech/pages.t 2010-09-13 00:58:44 +0000 | |||
| 130 | +++ app-mvhub/t/mech/pages.t 2010-10-29 19:42:40 +0000 | |||
| 131 | @@ -14,6 +14,7 @@ | |||
| 132 | 14 | 14 | ||
| 133 | 15 | { #main | 15 | { #main |
| 134 | 16 | my $host = TestHelper::get_test_website_name('mvh'); | 16 | my $host = TestHelper::get_test_website_name('mvh'); |
| 135 | 17 | my $mech = Test::WWW::Mechanize->new(); | ||
| 136 | 17 | 18 | ||
| 137 | 18 | my @mvh_pages_from_both = init_pages_for_both($host); | 19 | my @mvh_pages_from_both = init_pages_for_both($host); |
| 138 | 19 | my @pages_for_mvh = init_pages_for_mvh_only($host); | 20 | my @pages_for_mvh = init_pages_for_mvh_only($host); |
| 139 | @@ -33,17 +34,15 @@ | |||
| 140 | 33 | ); | 34 | ); |
| 141 | 34 | 35 | ||
| 142 | 35 | my $NUMBER_OF_TESTS_PER_PAGE = 6; | 36 | my $NUMBER_OF_TESTS_PER_PAGE = 6; |
| 143 | 37 | |||
| 144 | 36 | my $number_of_tests | 38 | my $number_of_tests |
| 145 | 37 | = ( ( scalar @total_pages ) * $NUMBER_OF_TESTS_PER_PAGE ); | 39 | = ( ( scalar @total_pages ) * $NUMBER_OF_TESTS_PER_PAGE ); |
| 146 | 38 | |||
| 147 | 39 | plan tests => $number_of_tests; | 40 | plan tests => $number_of_tests; |
| 148 | 40 | my $mech = Test::WWW::Mechanize->new(); | ||
| 149 | 41 | $mech->default_header( Authorization => TestHelper::create_temp_auth() ); | ||
| 150 | 42 | 41 | ||
| 155 | 43 | TestHelper::pages_get_ok( $mech, @total_pages ); | 42 | TestHelper::pages_add_ok(@total_pages); |
| 156 | 44 | pages_links_ok( $mech, @total_pages ); | 43 | pages_links_ok(@total_pages); |
| 157 | 45 | pages_lint_ok( $mech, @total_pages ); | 44 | pages_lint_ok(@total_pages); |
| 158 | 46 | pages_html_tidy_ok( $mech, @total_pages ); | 45 | pages_html_tidy_ok(@total_pages); |
| 159 | 47 | 46 | ||
| 160 | 48 | } #main | 47 | } #main |
| 161 | 49 | 48 | ||
| 162 | @@ -55,62 +54,74 @@ | |||
| 163 | 55 | 'expected_content' => " Search for Social Services", | 54 | 'expected_content' => " Search for Social Services", |
| 164 | 56 | 'tests_to_skip' => 'tidy lint link get', | 55 | 'tests_to_skip' => 'tidy lint link get', |
| 165 | 57 | 'skip_reason' => 'dan 2008-02-06 testing ability to skip', | 56 | 'skip_reason' => 'dan 2008-02-06 testing ability to skip', |
| 166 | 57 | 'mech' => undef, | ||
| 167 | 58 | }, | 58 | }, |
| 168 | 59 | { 'url' => "http://$host", | 59 | { 'url' => "http://$host", |
| 169 | 60 | 'expected_content' => "Search for Social Services", | 60 | 'expected_content' => "Search for Social Services", |
| 170 | 61 | 'tests_to_skip' => '', | 61 | 'tests_to_skip' => '', |
| 171 | 62 | 'skip_reason' => '', | 62 | 'skip_reason' => '', |
| 172 | 63 | 'mech' => undef, | ||
| 173 | 63 | }, | 64 | }, |
| 174 | 64 | { 'url' => "http://$host/html/about.shtml", | 65 | { 'url' => "http://$host/html/about.shtml", |
| 175 | 65 | 'expected_content' => "Our Purpose", | 66 | 'expected_content' => "Our Purpose", |
| 176 | 66 | 'tests_to_skip' => '', | 67 | 'tests_to_skip' => '', |
| 177 | 67 | 'skip_reason' => '', | 68 | 'skip_reason' => '', |
| 178 | 69 | 'mech' => undef, | ||
| 179 | 68 | }, | 70 | }, |
| 180 | 69 | { 'url' => "http://$host/html/help.shtml", | 71 | { 'url' => "http://$host/html/help.shtml", |
| 181 | 70 | 'expected_content' => "Agency Account Help", | 72 | 'expected_content' => "Agency Account Help", |
| 182 | 71 | 'tests_to_skip' => '', | 73 | 'tests_to_skip' => '', |
| 183 | 72 | 'skip_reason' => '', | 74 | 'skip_reason' => '', |
| 184 | 75 | 'mech' => undef, | ||
| 185 | 73 | }, | 76 | }, |
| 186 | 74 | { 'url' => "http://$host/html/register.shtml", | 77 | { 'url' => "http://$host/html/register.shtml", |
| 187 | 75 | 'expected_content' => "Why register your agency", | 78 | 'expected_content' => "Why register your agency", |
| 188 | 76 | 'tests_to_skip' => '', | 79 | 'tests_to_skip' => '', |
| 189 | 77 | 'skip_reason' => '', | 80 | 'skip_reason' => '', |
| 190 | 81 | 'mech' => undef, | ||
| 191 | 78 | }, | 82 | }, |
| 192 | 79 | { 'url' => "http://$host/reports", | 83 | { 'url' => "http://$host/reports", |
| 193 | 80 | 'expected_content' => "PDF Reports", | 84 | 'expected_content' => "PDF Reports", |
| 194 | 81 | 'tests_to_skip' => '', | 85 | 'tests_to_skip' => '', |
| 195 | 82 | 'skip_reason' => '', | 86 | 'skip_reason' => '', |
| 196 | 87 | 'mech' => undef, | ||
| 197 | 83 | }, | 88 | }, |
| 198 | 84 | { 'url' => "http://$host/reports/", | 89 | { 'url' => "http://$host/reports/", |
| 199 | 85 | 'expected_content' => "PDF Reports", | 90 | 'expected_content' => "PDF Reports", |
| 200 | 86 | 'tests_to_skip' => '', | 91 | 'tests_to_skip' => '', |
| 201 | 87 | 'skip_reason' => '', | 92 | 'skip_reason' => '', |
| 202 | 93 | 'mech' => undef, | ||
| 203 | 88 | }, | 94 | }, |
| 204 | 89 | 95 | ||
| 205 | 90 | { 'url' => "http://$host/cgi-bin/mvhub/agency_form.pl", | 96 | { 'url' => "http://$host/cgi-bin/mvhub/agency_form.pl", |
| 206 | 91 | 'expected_content' => "Password", | 97 | 'expected_content' => "Password", |
| 207 | 92 | 'tests_to_skip' => '', | 98 | 'tests_to_skip' => '', |
| 208 | 93 | 'skip_reason' => '', | 99 | 'skip_reason' => '', |
| 209 | 100 | 'mech' => undef, | ||
| 210 | 94 | }, | 101 | }, |
| 211 | 95 | { 'url' => "http://$host/cgi-bin/mvhub/guide.pl?rm=browse_headings", | 102 | { 'url' => "http://$host/cgi-bin/mvhub/guide.pl?rm=browse_headings", |
| 212 | 96 | 'expected_content' => "Arts/Culture/Entertainment", | 103 | 'expected_content' => "Arts/Culture/Entertainment", |
| 213 | 97 | 'tests_to_skip' => '', | 104 | 'tests_to_skip' => '', |
| 214 | 98 | 'skip_reason' => '', | 105 | 'skip_reason' => '', |
| 215 | 106 | 'mech' => undef, | ||
| 216 | 99 | }, | 107 | }, |
| 217 | 100 | { 'url' => "http://$host/cgi-bin/mvhub/admin/admin_reports.pl", | 108 | { 'url' => "http://$host/cgi-bin/mvhub/admin/admin_reports.pl", |
| 218 | 101 | 'expected_content' => "Administrative Reports", | 109 | 'expected_content' => "Administrative Reports", |
| 219 | 102 | 'tests_to_skip' => '', | 110 | 'tests_to_skip' => '', |
| 220 | 103 | 'skip_reason' => '', | 111 | 'skip_reason' => '', |
| 221 | 112 | 'mech' => undef, | ||
| 222 | 104 | }, | 113 | }, |
| 223 | 105 | { 'url' => "http://$host/cgi-bin/mvhub/admin/admin.pl", | 114 | { 'url' => "http://$host/cgi-bin/mvhub/admin/admin.pl", |
| 224 | 106 | 'expected_content' => "Add a New Agency", | 115 | 'expected_content' => "Add a New Agency", |
| 225 | 107 | 'tests_to_skip' => '', | 116 | 'tests_to_skip' => '', |
| 226 | 108 | 'skip_reason' => '', | 117 | 'skip_reason' => '', |
| 227 | 118 | 'mech' => undef, | ||
| 228 | 109 | }, | 119 | }, |
| 229 | 110 | { 'url' => "http://$host/cgi-bin/mvhub/logout.pl", | 120 | { 'url' => "http://$host/cgi-bin/mvhub/logout.pl", |
| 230 | 111 | 'expected_content' => "You have been logged out", | 121 | 'expected_content' => "You have been logged out", |
| 231 | 112 | 'tests_to_skip' => '', | 122 | 'tests_to_skip' => '', |
| 232 | 113 | 'skip_reason' => '', | 123 | 'skip_reason' => '', |
| 233 | 124 | 'mech' => undef, | ||
| 234 | 114 | }, | 125 | }, |
| 235 | 115 | { 'url' => | 126 | { 'url' => |
| 236 | 116 | "http://$host/cgi-bin/mvhub/agency.pl?rm=ql&aid=00&qlid=00", | 127 | "http://$host/cgi-bin/mvhub/agency.pl?rm=ql&aid=00&qlid=00", |
| 237 | @@ -118,12 +129,14 @@ | |||
| 238 | 118 | "Invalid quick log-in ID, please log in manually", | 129 | "Invalid quick log-in ID, please log in manually", |
| 239 | 119 | 'tests_to_skip' => '', | 130 | 'tests_to_skip' => '', |
| 240 | 120 | 'skip_reason' => '', | 131 | 'skip_reason' => '', |
| 241 | 132 | 'mech' => undef, | ||
| 242 | 121 | }, | 133 | }, |
| 243 | 122 | { 'url' => "http://$host/cgi-bin/mvhub/agency.pl?rm=ql&id=00", | 134 | { 'url' => "http://$host/cgi-bin/mvhub/agency.pl?rm=ql&id=00", |
| 244 | 123 | 'expected_content' => | 135 | 'expected_content' => |
| 245 | 124 | "You used an old login URL that is no longer valid", | 136 | "You used an old login URL that is no longer valid", |
| 246 | 125 | 'tests_to_skip' => '', | 137 | 'tests_to_skip' => '', |
| 247 | 126 | 'skip_reason' => '', | 138 | 'skip_reason' => '', |
| 248 | 139 | 'mech' => undef, | ||
| 249 | 127 | }, | 140 | }, |
| 250 | 128 | ); | 141 | ); |
| 251 | 129 | return @pages; | 142 | return @pages; |
| 252 | @@ -139,6 +152,7 @@ | |||
| 253 | 139 | 'expected_content' => "You must log in to access this page", | 152 | 'expected_content' => "You must log in to access this page", |
| 254 | 140 | 'tests_to_skip' => '', | 153 | 'tests_to_skip' => '', |
| 255 | 141 | 'skip_reason' => '', | 154 | 'skip_reason' => '', |
| 256 | 155 | 'mech' => undef, | ||
| 257 | 142 | }, | 156 | }, |
| 258 | 143 | { 'url' => | 157 | { 'url' => |
| 259 | 144 | "http://$host//cgi-bin/mvhub/guide.pl?rm=show_agency&agency_id=100088", | 158 | "http://$host//cgi-bin/mvhub/guide.pl?rm=show_agency&agency_id=100088", |
| 260 | @@ -146,23 +160,27 @@ | |||
| 261 | 146 | 'tests_to_skip' => 'tidy lint', | 160 | 'tests_to_skip' => 'tidy lint', |
| 262 | 147 | 'skip_reason' => | 161 | 'skip_reason' => |
| 263 | 148 | 'dan 2008-02-06 record uses smart quotes we dont strip ', | 162 | 'dan 2008-02-06 record uses smart quotes we dont strip ', |
| 264 | 163 | 'mech' => undef, | ||
| 265 | 149 | }, | 164 | }, |
| 266 | 150 | { 'url' => | 165 | { 'url' => |
| 267 | 151 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_agency&agency_id=101342", | 166 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_agency&agency_id=101342", |
| 268 | 152 | 'expected_content' => "(The CSL)", | 167 | 'expected_content' => "(The CSL)", |
| 269 | 153 | 'tests_to_skip' => '', | 168 | 'tests_to_skip' => '', |
| 270 | 154 | 'skip_reason' => '', | 169 | 'skip_reason' => '', |
| 271 | 170 | 'mech' => undef, | ||
| 272 | 155 | }, | 171 | }, |
| 273 | 156 | { 'url' => | 172 | { 'url' => |
| 274 | 157 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_program&program_id=503916", | 173 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_program&program_id=503916", |
| 275 | 158 | 'expected_content' => "Community Software Lab", | 174 | 'expected_content' => "Community Software Lab", |
| 276 | 159 | 'tests_to_skip' => '', | 175 | 'tests_to_skip' => '', |
| 277 | 160 | 'skip_reason' => '', | 176 | 'skip_reason' => '', |
| 278 | 177 | 'mech' => undef, | ||
| 279 | 161 | }, | 178 | }, |
| 280 | 162 | { 'url' => "http://$host/html/reports.shtml", | 179 | { 'url' => "http://$host/html/reports.shtml", |
| 281 | 163 | 'expected_content' => "formatted for printing", | 180 | 'expected_content' => "formatted for printing", |
| 282 | 164 | 'tests_to_skip' => 'link', | 181 | 'tests_to_skip' => 'link', |
| 283 | 165 | 'skip_reason' => 'dan 2008-02-06 link to pdf not implemented', | 182 | 'skip_reason' => 'dan 2008-02-06 link to pdf not implemented', |
| 284 | 183 | 'mech' => undef, | ||
| 285 | 166 | }, | 184 | }, |
| 286 | 167 | { 'url' => | 185 | { 'url' => |
| 287 | 168 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_program_results&category_id=804796", | 186 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_program_results&category_id=804796", |
| 288 | @@ -170,6 +188,7 @@ | |||
| 289 | 170 | "programs related to: Visual Arts Classes, Youth/Teen", | 188 | "programs related to: Visual Arts Classes, Youth/Teen", |
| 290 | 171 | 'tests_to_skip' => '', | 189 | 'tests_to_skip' => '', |
| 291 | 172 | 'skip_reason' => '', | 190 | 'skip_reason' => '', |
| 292 | 191 | 'mech' => undef, | ||
| 293 | 173 | }, | 192 | }, |
| 294 | 174 | ); | 193 | ); |
| 295 | 175 | } | 194 | } |
| 296 | @@ -189,6 +208,7 @@ | |||
| 297 | 189 | 'expected_content' => "You must log in to access this page", | 208 | 'expected_content' => "You must log in to access this page", |
| 298 | 190 | 'tests_to_skip' => '', | 209 | 'tests_to_skip' => '', |
| 299 | 191 | 'skip_reason' => '', | 210 | 'skip_reason' => '', |
| 300 | 211 | 'mech' => undef, | ||
| 301 | 192 | }, | 212 | }, |
| 302 | 193 | { 'url' => | 213 | { 'url' => |
| 303 | 194 | "http://$host//cgi-bin/mvhub/guide.pl?rm=show_agency&agency_id=103531", | 214 | "http://$host//cgi-bin/mvhub/guide.pl?rm=show_agency&agency_id=103531", |
| 304 | @@ -196,18 +216,21 @@ | |||
| 305 | 196 | 'tests_to_skip' => 'tidy lint', | 216 | 'tests_to_skip' => 'tidy lint', |
| 306 | 197 | 'skip_reason' => | 217 | 'skip_reason' => |
| 307 | 198 | 'dan 2008-02-06 record uses smart quotes we dont strip ', | 218 | 'dan 2008-02-06 record uses smart quotes we dont strip ', |
| 308 | 219 | 'mech' => undef, | ||
| 309 | 199 | }, | 220 | }, |
| 310 | 200 | { 'url' => | 221 | { 'url' => |
| 311 | 201 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_agency&agency_id=103542", | 222 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_agency&agency_id=103542", |
| 312 | 202 | 'expected_content' => "Law Center of Massachusetts", | 223 | 'expected_content' => "Law Center of Massachusetts", |
| 313 | 203 | 'tests_to_skip' => '', | 224 | 'tests_to_skip' => '', |
| 314 | 204 | 'skip_reason' => '', | 225 | 'skip_reason' => '', |
| 315 | 226 | 'mech' => undef, | ||
| 316 | 205 | }, | 227 | }, |
| 317 | 206 | { 'url' => | 228 | { 'url' => |
| 318 | 207 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_program&program_id=509515", | 229 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_program&program_id=509515", |
| 319 | 208 | 'expected_content' => "(NSCAP)", | 230 | 'expected_content' => "(NSCAP)", |
| 320 | 209 | 'tests_to_skip' => '', | 231 | 'tests_to_skip' => '', |
| 321 | 210 | 'skip_reason' => '', | 232 | 'skip_reason' => '', |
| 322 | 233 | 'mech' => undef, | ||
| 323 | 211 | }, | 234 | }, |
| 324 | 212 | { 'url' => | 235 | { 'url' => |
| 325 | 213 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_program_results&category_id=801584", | 236 | "http://$host/cgi-bin/mvhub/guide.pl?rm=show_program_results&category_id=801584", |
| 326 | @@ -215,12 +238,14 @@ | |||
| 327 | 215 | "programs related to: Adult Basic Education", | 238 | "programs related to: Adult Basic Education", |
| 328 | 216 | 'tests_to_skip' => '', | 239 | 'tests_to_skip' => '', |
| 329 | 217 | 'skip_reason' => '', | 240 | 'skip_reason' => '', |
| 330 | 241 | 'mech' => undef, | ||
| 331 | 218 | }, | 242 | }, |
| 332 | 219 | { 'url' => "http://$host/$agency_id/$quick_login_id", | 243 | { 'url' => "http://$host/$agency_id/$quick_login_id", |
| 333 | 220 | 'expected_content' => | 244 | 'expected_content' => |
| 334 | 221 | "Agency Account Home Page - North Shore Community Action Programs, Inc.", | 245 | "Agency Account Home Page - North Shore Community Action Programs, Inc.", |
| 335 | 222 | 'tests_to_skip' => '', | 246 | 'tests_to_skip' => '', |
| 336 | 223 | 'skip_reason' => '', | 247 | 'skip_reason' => '', |
| 337 | 248 | 'mech' => undef, | ||
| 338 | 224 | }, | 249 | }, |
| 339 | 225 | { 'url' => | 250 | { 'url' => |
| 340 | 226 | "http://$host/cgi-bin/mvhub/agency.pl?rm=ql&aid=$agency_id&qlid=$quick_login_id", | 251 | "http://$host/cgi-bin/mvhub/agency.pl?rm=ql&aid=$agency_id&qlid=$quick_login_id", |
| 341 | @@ -228,18 +253,31 @@ | |||
| 342 | 228 | "Agency Account Home Page - North Shore Community Action Programs, Inc.", | 253 | "Agency Account Home Page - North Shore Community Action Programs, Inc.", |
| 343 | 229 | 'tests_to_skip' => '', | 254 | 'tests_to_skip' => '', |
| 344 | 230 | 'skip_reason' => '', | 255 | 'skip_reason' => '', |
| 345 | 256 | 'mech' => undef, | ||
| 346 | 231 | }, | 257 | }, |
| 347 | 232 | ); | 258 | ); |
| 348 | 233 | } | 259 | } |
| 349 | 234 | 260 | ||
| 350 | 261 | sub add_mech_objects { | ||
| 351 | 262 | my @pages = @_ or die 'add_mech_objects() missing param: @pages'; | ||
| 352 | 263 | |||
| 353 | 264 | foreach my $page (@pages) { | ||
| 354 | 265 | my $mech = Test::WWW::Mechanize->new(); | ||
| 355 | 266 | $mech->default_header( | ||
| 356 | 267 | Authorization => TestHelper::create_temp_auth() ); | ||
| 357 | 268 | $mech->get( $$page{url} ); | ||
| 358 | 269 | $$page{mech} = $mech; | ||
| 359 | 270 | } | ||
| 360 | 271 | @pages; | ||
| 361 | 272 | } | ||
| 362 | 273 | |||
| 363 | 235 | sub pages_links_ok { | 274 | sub pages_links_ok { |
| 367 | 236 | my $mech = shift or die 'page_links_ok() missing param: $mech'; | 275 | my @pages = @_ or die 'page_links_ok() missing param: @pages'; |
| 368 | 237 | my @pages = @_ or die 'page_links_ok() missing param: @pages'; | 276 | my $mech = ''; |
| 366 | 238 | |||
| 369 | 239 | PAGES: | 277 | PAGES: |
| 370 | 240 | foreach my $page (@pages) { | 278 | foreach my $page (@pages) { |
| 371 | 241 | SKIP: { | 279 | SKIP: { |
| 373 | 242 | $mech->get( $$page{url} ); | 280 | $mech = $$page{mech}; |
| 374 | 243 | if ( $$page{tests_to_skip} =~ 'link' ) { | 281 | if ( $$page{tests_to_skip} =~ 'link' ) { |
| 375 | 244 | skip "$$page{url} $$page{skip_reason}", 1; | 282 | skip "$$page{url} $$page{skip_reason}", 1; |
| 376 | 245 | next PAGES; | 283 | next PAGES; |
| 377 | @@ -296,12 +334,11 @@ | |||
| 378 | 296 | } | 334 | } |
| 379 | 297 | 335 | ||
| 380 | 298 | sub pages_lint_ok { | 336 | sub pages_lint_ok { |
| 383 | 299 | my $mech = shift or die 'page_lint_ok() missing param: $mech'; | 337 | my @pages = @_ or die 'page_lint_ok() missing param: @pages'; |
| 382 | 300 | my @pages = @_ or die 'page_lint_ok() missing param: @pages'; | ||
| 384 | 301 | 338 | ||
| 385 | 302 | foreach my $page (@pages) { | 339 | foreach my $page (@pages) { |
| 386 | 303 | SKIP: { | 340 | SKIP: { |
| 388 | 304 | $mech->get( $$page{url} ); | 341 | my $mech = $$page{mech}; |
| 389 | 305 | skip $$page{skip_reason}, 1 | 342 | skip $$page{skip_reason}, 1 |
| 390 | 306 | if $$page{tests_to_skip} =~ 'lint'; | 343 | if $$page{tests_to_skip} =~ 'lint'; |
| 391 | 307 | $mech->html_lint_ok("Lint: "); | 344 | $mech->html_lint_ok("Lint: "); |
| 392 | @@ -310,12 +347,11 @@ | |||
| 393 | 310 | } | 347 | } |
| 394 | 311 | 348 | ||
| 395 | 312 | sub pages_html_tidy_ok { | 349 | sub pages_html_tidy_ok { |
| 398 | 313 | my $mech = shift or die 'pages_html_tidy_ok() missing param: $mech'; | 350 | my @pages = @_ or die 'pages_html_tidy_ok() missing param: @pages'; |
| 397 | 314 | my @pages = @_ or die 'pages_html_tidy_ok() missing param: @pages'; | ||
| 399 | 315 | 351 | ||
| 400 | 316 | foreach my $page (@pages) { | 352 | foreach my $page (@pages) { |
| 401 | 317 | SKIP: { | 353 | SKIP: { |
| 403 | 318 | $mech->get( $$page{url} ); | 354 | my $mech = $$page{mech}; |
| 404 | 319 | skip $$page{skip_reason}, 1 | 355 | skip $$page{skip_reason}, 1 |
| 405 | 320 | if $$page{tests_to_skip} =~ 'tidy'; | 356 | if $$page{tests_to_skip} =~ 'tidy'; |
| 406 | 321 | my $short_page = shorten_pagename( $$page{url} ); | 357 | my $short_page = shorten_pagename( $$page{url} ); |
| 407 | 322 | 358 | ||
| 408 | === modified file 'lib-mvhub/t/lib/TestHelper.pm' | |||
| 409 | --- lib-mvhub/t/lib/TestHelper.pm 2010-10-16 00:29:43 +0000 | |||
| 410 | +++ lib-mvhub/t/lib/TestHelper.pm 2010-10-29 19:42:40 +0000 | |||
| 411 | @@ -189,6 +189,37 @@ | |||
| 412 | 189 | } | 189 | } |
| 413 | 190 | } | 190 | } |
| 414 | 191 | 191 | ||
| 415 | 192 | sub pages_add_ok { | ||
| 416 | 193 | my @pages = @_ or die 'pages_add_ok() missing param: @pages'; | ||
| 417 | 194 | my $mech; | ||
| 418 | 195 | |||
| 419 | 196 | foreach my $page (@pages) { | ||
| 420 | 197 | SKIP: { | ||
| 421 | 198 | skip "$page->{url} $$page{skip_reason}", 3 | ||
| 422 | 199 | if $$page{tests_to_skip} =~ 'get'; | ||
| 423 | 200 | |||
| 424 | 201 | if ( not defined $$page{mech} ) { | ||
| 425 | 202 | $$page{mech} = Test::WWW::Mechanize->new(); | ||
| 426 | 203 | $$page{mech}->default_header( | ||
| 427 | 204 | Authorization => TestHelper::create_temp_auth() ); | ||
| 428 | 205 | } | ||
| 429 | 206 | |||
| 430 | 207 | $mech = $$page{mech}; | ||
| 431 | 208 | $mech->get_ok( $$page{url}, "got ok: $$page{url}" ); | ||
| 432 | 209 | $mech->content_lacks( | ||
| 433 | 210 | 'an error in processing your request', | ||
| 434 | 211 | "no error in: | ||
| 435 | 212 | " . $page->{url} | ||
| 436 | 213 | ); | ||
| 437 | 214 | $mech->content_contains( | ||
| 438 | 215 | $$page{expected_content}, | ||
| 439 | 216 | " $$page{expected_content} | ||
| 440 | 217 | found in: $page->{url}" | ||
| 441 | 218 | ); | ||
| 442 | 219 | } | ||
| 443 | 220 | } | ||
| 444 | 221 | } | ||
| 445 | 222 | |||
| 446 | 192 | sub run_submit_forms_ok { | 223 | sub run_submit_forms_ok { |
| 447 | 193 | my %args = @_; | 224 | my %args = @_; |
| 448 | 194 | my $prefix = $args{prefix} or croak "missing param: \$prefix"; | 225 | my $prefix = $args{prefix} or croak "missing param: \$prefix"; |
curious as to purpose of line #49 in diff
48 + 'mech'=>'',
49 + 'http_response'