The following template variables are available for all Authentication Login templates. +
+|, + lastUpdated => 1164394398 + }, + + 'login.form.header' => { + message => q|The required form elements that go at the top of the login page.|, + lastUpdated => 1149220294, + }, + + 'login.form.hidden' => { + message => q|Hidden form fields required for form submission|, + lastUpdated => 1149220294, + }, + + 'login.form.footer' => { + message => q|The required form elements that go after the login page form.|, + lastUpdated => 1149220294, + }, + + 'login.form.submit' => { + message => q|The default submit button for the login form.|, + lastUpdated => 1149220294, + }, + + 'login.form.username' => { + message => q|Default username form field|, + lastUpdated => 1149220294, + }, + + 'login.form.username.label' => { + message => q|Default text for username form field|, + lastUpdated => 1149220294, + }, + + 'login.form.password' => { + message => q|Default password form field|, + lastUpdated => 1149220294, + }, + + 'login.form.password.label' => { + message => q|Default text for password form field|, + lastUpdated => 1149220294, + }, + + 'anonymousRegistration.isAllowed' => { + message => q|Flag indicating whether or not anonymous registrations are allowed.|, + lastUpdated => 1149220294, + }, + + 'createAccount.url' => { + message => q|URL for the anonymous registration page|, + lastUpdated => 1149220294, + }, + + 'createAccount.label' => { + message => q|Default label for the anonymous registration link.|, + lastUpdated => 1149220294, + }, + + 'deactivate account template title' => { + message => q|Authentication Deactivate Account Template|, + lastUpdated => 1164394401 + }, + + 'deactivate account template body' => { + message => q|The following template variables are available for all Authentication Deactivate account templates. +
+|, + lastUpdated => 1164394398 + }, + + 'yes.label' => { + message => q|Internationalized label for "Yes".|, + lastUpdated => 1149220294, + }, + + 'no.label' => { + message => q|Internationalized label for "No".|, + lastUpdated => 1149220294, + }, + + 'yes.url' => { + message => q|URL to deactivate the user's account.|, + lastUpdated => 1149220294, + }, + + 'no.url' => { + message => q|URL to leave the user's account alone|, + lastUpdated => 1149220294, + }, + + 'question' => { + message => q|URL to leave the user's account alone|, + lastUpdated => 1149220294, + }, + 'topicName' => { message => q|Authentication|, lastUpdated => 1164338173, diff --git a/lib/WebGUI/i18n/English/AuthWebGUI.pm b/lib/WebGUI/i18n/English/AuthWebGUI.pm index 14fe67efe..170269016 100644 --- a/lib/WebGUI/i18n/English/AuthWebGUI.pm +++ b/lib/WebGUI/i18n/English/AuthWebGUI.pm @@ -111,51 +111,11 @@ our $I18N = { lastUpdated => 1071507721 }, - 'login.form.header' => { - message => q|The required form elements that go at the top of the login page.|, - lastUpdated => 1149220294, - }, - - 'login.form.hidden' => { - message => q|Hidden form fields required for form submission|, - lastUpdated => 1149220294, - }, - 'title' => { message => q|Default page title.|, lastUpdated => 1164335682, }, - 'login.form.footer' => { - message => q|The required form elements that go after the login page form.|, - lastUpdated => 1149220294, - }, - - 'login.form.submit' => { - message => q|The default submit button for the login form.|, - lastUpdated => 1149220294, - }, - - 'login.form.username' => { - message => q|Default username form field|, - lastUpdated => 1149220294, - }, - - 'login.form.username.label' => { - message => q|Default text for username form field|, - lastUpdated => 1149220294, - }, - - 'login.form.password' => { - message => q|Default password form field|, - lastUpdated => 1149220294, - }, - - 'login.form.password.label' => { - message => q|Default text for password form field|, - lastUpdated => 1149220294, - }, - 'login.message' => { message => q|Any message returned by the system. Usually displays after the form is submitted.|, lastUpdated => 1149220294, @@ -506,6 +466,18 @@ our $I18N = { lastUpdated => 1071507752 }, + 'deactivate account template title' => { + message => q|WebGUI Authentication Deactivate Account Template|, + lastUpdated => 1164394401 + }, + + 'deactivate account template body' => { + message => q|The following template variables are available for the WebGUI Authentication Deactivate account templates. +
+|, + lastUpdated => 1164394398 + }, + 'topicName' => { message => q|WebGUI Authentication|, lastUpdated => 1128919828, diff --git a/t/Help/setHelp.t b/t/Help/setHelp.t index 978f2488b..1c182db88 100644 --- a/t/Help/setHelp.t +++ b/t/Help/setHelp.t @@ -25,6 +25,7 @@ use File::Find; use Test::More; # increment this value for each test you create my $numTests = 0; +plan skip_all => 'set CODE_COP to enable this test' unless $ENV{CODE_COP}; my $session = WebGUI::Test->session; my $lib = WebGUI::Test->lib; diff --git a/t/Workflow.t b/t/Workflow.t index b815b3adf..dfb078711 100644 --- a/t/Workflow.t +++ b/t/Workflow.t @@ -15,7 +15,7 @@ use WebGUI::Test; use WebGUI::Session; use WebGUI::Workflow; use WebGUI::Utility qw/isIn/; -use Test::More tests => 0; # increment this value for each test you create +use Test::More tests => 16; # increment this value for each test you create my $session = WebGUI::Test->session; my $wf = WebGUI::Workflow->create($session, {title => 'Title', description => 'Description', @@ -40,8 +40,9 @@ ok(!isIn($wfId, keys %{WebGUI::Workflow->getList($session)}), 'workflow not in e $wf->set({enabled => 1}); ok($wf->get('enabled'), 'workflow is enabled'); ok(isIn($wfId, keys %{WebGUI::Workflow->getList($session)}), 'workflow in enabled list'); +$session->errorHandler->warn('Interesting'); $wf->set({enabled => 0}); -ok($wf->get('enabled'), 'workflow is disabled again'); +ok(!$wf->get('enabled'), 'workflow is disabled again'); $wf->delete; ok(!defined WebGUI::Workflow->new($session, $wfId), 'deleted workflow cannot be retrieved'); diff --git a/t/i18n/help.t b/t/i18n/help.t new file mode 100644 index 000000000..125567e8a --- /dev/null +++ b/t/i18n/help.t @@ -0,0 +1,149 @@ +#------------------------------------------------------------------- +# WebGUI is Copyright 2001-2006 Plain Black Corporation. +#------------------------------------------------------------------- +# Please read the legal notices (docs/legal.txt) and the license +# (docs/license.txt) that came with this distribution before using +# this software. +#------------------------------------------------------------------- +# http://www.plainblack.com info@plainblack.com +#------------------------------------------------------------------- + +use FindBin; +use strict; +use warnings; +use lib "$FindBin::Bin/../lib"; ##t/lib + +use WebGUI::Test; +use WebGUI::Operation::Help; +use WebGUI::International; +use WebGUI::Session; +use Text::Balanced qw(extract_codeblock); +use File::Find; +use Data::Dumper; + +#The goal of this test is to verify all the i18n labels in +#the help files. It used to be glommed into the same test as +#the code scanner, but was broken out due to speed issues. + +use Test::More; # increment this value for each test you create +my $numTests = 0; + +my $session = WebGUI::Test->session; +my $lib = WebGUI::Test->lib; + +# put your tests here + +my %helpTable; + +my @helpFileSet = WebGUI::Operation::Help::_getHelpFilesList($session); + +foreach my $helpSet (@helpFileSet) { + my $helpName = $helpSet->[1]; + my $help = WebGUI::Operation::Help::_load($session, $helpName); + $helpTable{ $helpName } = $help; +} + +##Scan #1, find all labels in the help system. body, title, @fields + +## Array of hashes +## each hash will have: +## topic -> which help file it is from +## entry -> which entry in the help file +## tag -> which tag in the entry in the help file +## namespace -> which help file it is form +## label -> which help file it is form + +my @helpLabels; +my @sqlLabels; +my @libLabels; +my @objLabels; + + +@helpLabels = getHelpLabels(); + +$numTests = scalar(@helpLabels); + +plan tests => $numTests; + +my $i18n = WebGUI::International->new($session); + +foreach my $label ( @helpLabels ) { + ok($i18n->get(@{ $label }{qw(label namespace )} ), + sprintf "label: %s->%s inside %s->%s->%s", @{ $label }{'namespace', 'label', 'topic', 'entry', 'tag', }); +} + +sub getHelpLabels { + my @helpLabels = (); + foreach my $topic ( keys %helpTable ) { + foreach my $entry ( keys %{ $helpTable{$topic} }) { + ##Check the title and body data + push @helpLabels, { + topic=>$topic, + entry=>$entry, + tag=>'title', + namespace=>$topic, ##default + label=>$helpTable{$topic}{$entry}{'title'}, + }; + if (ref $helpTable{$topic}{$entry}{'body'} ne 'CODE') { + push @helpLabels, { + topic=>$topic, + entry=>$entry, + tag=>'body', + namespace=>$topic, ##default + label=>$helpTable{$topic}{$entry}{'body'}, + }; + } + + ##Add all labels in the fields array + foreach my $field (@{ $helpTable{$topic}{$entry}{fields} }) { + push @helpLabels, { + topic=>$topic, + entry=>$entry, + tag=>'fields', + namespace=>$field->{namespace}, + label=>$field->{title}, + }, + { + topic=>$topic, + entry=>$entry, + tag=>'fields', + namespace=>$field->{namespace}, + label=>$field->{description}, + },; + } + my $variableEntries = getHelpVariables($helpTable{$topic}{$entry}{variables}); + foreach my $variable ( @{ $variableEntries } ) { + my $namespace = exists $variable->{namespace} ? $variable->{namespace} : $topic; + my $one = { + topic=>$topic, + entry=>$entry, + tag=>'variables', + namespace=>$namespace, + }; + if ($variable->{description}) { + $one->{label} = $variable->{description}, + } + else { + $one->{label} = $variable->{name}, + } + push @helpLabels, $one; + } + } + } + return @helpLabels; +} + +sub getHelpVariables { + my ($variables) = @_; ##An arrayref of variables, possibly with nested variables in loops + my $tmplVars = []; + foreach my $var ( @{ $variables } ) { + if ( exists $var->{variables} ) { + push @{ $tmplVars }, @{ getHelpVariables($var->{variables}) }; + delete $var->{variables}; + } + push @{ $tmplVars }, $var; + } + return $tmplVars; +} + + diff --git a/t/i18n/label.t b/t/i18n/label.t index 6d14b362d..098eba4aa 100644 --- a/t/i18n/label.t +++ b/t/i18n/label.t @@ -26,6 +26,7 @@ use Data::Dumper; use Test::More; # increment this value for each test you create my $numTests = 0; +plan skip_all => 'set CODE_COP to enable this test' unless $ENV{CODE_COP}; my $session = WebGUI::Test->session; my $lib = WebGUI::Test->lib; @@ -65,23 +66,14 @@ foreach my $helpSet (@helpFileSet) { ## namespace -> which help file it is form ## label -> which help file it is form -my @helpLabels; -my @sqlLabels; my @libLabels; my @objLabels; - -@helpLabels = getHelpLabels(); - -#@sqlLabels = getSQLLabels(); - find(\&label_finder_pm, $lib); find(\&obj_finder_pm, $lib); -$numTests = scalar(@helpLabels) -# + scalar(@sqlLabels) - + scalar(@libLabels) +$numTests = scalar(@libLabels) + scalar(@objLabels) ; @@ -89,19 +81,6 @@ plan tests => $numTests; my $i18n = WebGUI::International->new($session); -foreach my $label ( @helpLabels ) { - ok($i18n->get(@{ $label }{qw(label namespace )} ), - sprintf "label: %s->%s inside %s->%s->%s", @{ $label }{'namespace', 'label', 'topic', 'entry', 'tag', }); -} - -# -#foreach my $label ( @sqlLabels ) { -# ok($i18n->get(@{ $label }{qw(label namespace )} ), -# sprintf "label: %s->%s inside %s", @{ $label }{'namespace', 'label', 'file', }); -#} -# -##Subroutine calls are now illegal, everything must be done by object methods. - foreach my $label ( @libLabels ) { ok(0, sprintf "label: %s->%s inside %s", @{ $label }{'namespace', 'label', 'file', }); @@ -164,100 +143,4 @@ sub obj_finder_pm { } } -sub getHelpLabels { - my @helpLabels = (); - foreach my $topic ( keys %helpTable ) { - foreach my $entry ( keys %{ $helpTable{$topic} }) { - ##Check the title and body data - push @helpLabels, { - topic=>$topic, - entry=>$entry, - tag=>'title', - namespace=>$topic, ##default - label=>$helpTable{$topic}{$entry}{'title'}, - }; - if (ref $helpTable{$topic}{$entry}{'body'} ne 'CODE') { - push @helpLabels, { - topic=>$topic, - entry=>$entry, - tag=>'body', - namespace=>$topic, ##default - label=>$helpTable{$topic}{$entry}{'body'}, - }; - } - ##Add all labels in the fields array - foreach my $field (@{ $helpTable{$topic}{$entry}{fields} }) { - push @helpLabels, { - topic=>$topic, - entry=>$entry, - tag=>'fields', - namespace=>$field->{namespace}, - label=>$field->{title}, - }, - { - topic=>$topic, - entry=>$entry, - tag=>'fields', - namespace=>$field->{namespace}, - label=>$field->{description}, - },; - } - my $variableEntries = getHelpVariables($helpTable{$topic}{$entry}{variables}); - foreach my $variable ( @{ $variableEntries } ) { - my $namespace = exists $variable->{namespace} ? $variable->{namespace} : $topic; - my $one = { - topic=>$topic, - entry=>$entry, - tag=>'variables', - namespace=>$namespace, - }; - if ($variable->{description}) { - $one->{label} = $variable->{description}, - } - else { - $one->{label} = $variable->{name}, - } - push @helpLabels, $one; - } - } - } - return @helpLabels; -} - -sub getHelpVariables { - my ($variables) = @_; ##An arrayref of variables, possibly with nested variables in loops - my $tmplVars = []; - foreach my $var ( @{ $variables } ) { - if ( exists $var->{variables} ) { - push @{ $tmplVars }, @{ getHelpVariables($var->{variables}) }; - delete $var->{variables}; - } - push @{ $tmplVars }, $var; - } - return $tmplVars; -} - -sub getSQLLabels { - my @sqlLabels = (); - foreach my $file (qw/create.sql previousVersion.sql/) { - my $file2 = join '/', '../..', 'docs', $file; - open my $fh, $file2 or - die "Unable to open $file2: $!\n"; - local $/; - my $sql = <$fh>; - while ($sql =~ /WebGUI::International::get\(([^\)]+)\)/gs) { - my $args; - ($args = $1) =~ tr{\\"}{}d; - my ($label,$namespace) = split ',', $args; - $namespace = "WebGUI" unless $namespace; - push @sqlLabels, { - label => $label, - namespace => $namespace, - file => $file, - }; - } - close $fh; - } - return @sqlLabels; -}