oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'tags/WebGUI_7.6.8-beta' into survey-rfe

Browse source 
* commit 'tags/WebGUI_7.6.8-beta': (96 commits)
  Release 7.6.8-beta
  preparing for 7.6.8 release
  convert to new storage format
  fixing photo comment test
  fixed: Syndicated Content corrupts wide characters
  Add the WikiPage to the list of contributions shown in the Account Contributions tab.
  added #!/usr/bin/env perl to all utility scripts
  Forward port i18n fix for Gallery Album RSS list.
  Fix some Survey i18n typos in the time limit hoverhelp.
  Large batch of Help and i18n.  Also, make sure that the
  Fix a typo in the i18n help for the ITransact Pay Driver.
  Correct dataform captcha variable name in the help.
  Forward porting expanded patch for handling deleted things.
  Have Thingy check for existance of table and column to prevent
  Fix linking to other things and autocreating the form field for it.
  Update test to match fixed code.
  Remove the warnings pragma
  Only resize photos if they are larger than the Gallery resolutions.
  Fix a syntax error made in the i18n of the search button.
  I18n'ed a submit button in the manage transactions screen.
  ...

Conflicts:

	lib/WebGUI/Asset/Wobject/Survey.pm
	lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
	www/extras/wobject/Survey/editsurvey.js
	www/extras/wobject/Survey/editsurvey/object.js
This commit is contained in:
Patrick Donelan 2009-01-14 06:00:06 +00:00
commit b7520da07d
396 changed files with 2647 additions and 1186 deletions
Download patch file Download diff file Expand all files Collapse all files

4
t/Account.t
View file

@ -56,8 +56,8 @@ isa_ok( $account, "WebGUI::Account", 'Blessed into the right class' );
#----------------------------------------------------------------------------
# Test getUrl
is( $account->getUrl, $session->url->page('op=account;module=;do='),
'getUrl adds op, module, and do'
is( $account->getUrl, $session->url->page('op=account;module=;do='.$account->method),
'getUrl adds op, module, and do since no method has been set'
);
is( $account->getUrl( 'foo=bar' ), $session->url->page( 'op=account;foo=bar' ),

4
t/Asset/File/GalleryFile/Photo/comment.t
View file

@ -204,7 +204,7 @@ cmp_deeply(
re( qr{TinyMCE}i ),
),
commentForm_submit => all(
re( qr/<input[^>]+type="submit"[^>]+name="submit"[^>]+value="Save Comment"[^>]+>/ ),
re( qr/<input[^>]+type="submit"[^>]+name="submit"[^>]+value="Save Comment."[^>]+>/ ),
),
} ),
"appendTemplateVarsCommentForm returns the correct structure",
@ -243,7 +243,7 @@ cmp_deeply(
re( qr{$comment->{bodyText}} ),
),
commentForm_submit => all(
re( qr/<input[^>]+type="submit"[^>]+name="submit"[^>]+value="Save Comment"[^>]+>/ ),
re( qr/<input[^>]+type="submit"[^>]+name="submit"[^>]+value="Save Comment."[^>]+>/ ),
),
} ),
"appendTemplateVarsCommentForm returns the correct structure",

18
t/Asset/Wobject/Thingy.t
View file

@ -210,7 +210,11 @@ cmp_deeply(
field_value => 'test value',
field_url => undef,
field_name => "field_".$fieldId,
field_label => $i18n->get('assetName')." field"
field_label => $i18n->get('assetName')." field",
field_isRequired => '',
field_isVisible => '',
field_pretext => undef,
field_subtext => undef,
}],
'Getting newly added thing data: getViewThingVars returns correct field_loop.'
);
@ -227,7 +231,11 @@ cmp_deeply(
field_value => 'test value',
field_url => undef,
field_name => "field_".$fieldId,
field_label => $i18n->get('assetName')." field"
field_label => $i18n->get('assetName')." field",
field_isRequired => '',
field_isVisible => '',
field_pretext => undef,
field_subtext => undef,
}],
viewScreenTitle => "",
},
@ -246,7 +254,11 @@ cmp_deeply(
field_value => 'new test value',
field_url => undef,
field_name => "field_".$fieldId,
field_label => $i18n->get('assetName')." field"
field_label => $i18n->get('assetName')." field",
field_isRequired => '',
field_isVisible => '',
field_pretext => undef,
field_subtext => undef,
}],
'Getting updated thing data: getViewThingVars returns correct field_loop with updated value.'
);

18
t/Session/DateTime.t
View file

@ -213,15 +213,15 @@ cmp_ok(
#
####################################################
is(join(" ",$dt->secondsToInterval(60*60*24*365*2)), "2 years", "secondsToInterval(), years");
is(join(" ",$dt->secondsToInterval(60*60*24*365*2.4)), "2 years", "secondsToInterval(), years, rounded down");
is(join(" ",$dt->secondsToInterval(60*60*24*365*2.9)), "3 years", "secondsToInterval(), years, rounded up");
is(join(" ",$dt->secondsToInterval(60*60*24*363)), "12 months", "secondsToInterval(), months");
is(join(" ",$dt->secondsToInterval(60*60*24*7*3)), "3 weeks", "secondsToInterval(), weeks");
is(join(" ",$dt->secondsToInterval(60*60*24*5)), "5 days", "secondsToInterval(), days");
is(join(" ",$dt->secondsToInterval(60*60*18)), "18 hours", "secondsToInterval(), hours");
is(join(" ",$dt->secondsToInterval(60*27)), "27 minutes", "secondsToInterval(), minutes");
is(join(" ",$dt->secondsToInterval(59)), "59 seconds", "secondsToInterval(), seconds");
is(join(" ",$dt->secondsToInterval(60*60*24*365*2)), "2 Year(s)", "secondsToInterval(), years");
is(join(" ",$dt->secondsToInterval(60*60*24*365*2.4)), "2 Year(s)", "secondsToInterval(), years, rounded down");
is(join(" ",$dt->secondsToInterval(60*60*24*365*2.9)), "3 Year(s)", "secondsToInterval(), years, rounded up");
is(join(" ",$dt->secondsToInterval(60*60*24*363)), "12 Month(s)", "secondsToInterval(), months");
is(join(" ",$dt->secondsToInterval(60*60*24*7*3)), "3 Week(s)", "secondsToInterval(), weeks");
is(join(" ",$dt->secondsToInterval(60*60*24*5)), "5 Day(s)", "secondsToInterval(), days");
is(join(" ",$dt->secondsToInterval(60*60*18)), "18 Hour(s)", "secondsToInterval(), hours");
is(join(" ",$dt->secondsToInterval(60*27)), "27 Minute(s)", "secondsToInterval(), minutes");
is(join(" ",$dt->secondsToInterval(59)), "59 Second(s)", "secondsToInterval(), seconds");
####################################################
#

20
t/Session/Setting.t
View file

@ -19,16 +19,16 @@ use Test::More tests => 6; # increment this value for each test you create
my $session = WebGUI::Test->session;
$session->setting->add("test","XXX");
my ($value) = $session->db->quickArray("select value from settings where name='test'");
is($value, 'XXX', "add()");
is($session->setting->get("test"), "XXX", "get()");
$session->setting->set("test","YYY");
my ($value) = $session->db->quickArray("select value from settings where name='test'");
is($value, 'YYY', "set()");
is($session->setting->get("test"), 'YYY', 'set() also updates object cache');
$session->setting->remove("test");
my ($value) = $session->db->quickArray("select value from settings where name='test'");
$session->setting->add("inmate","30265");
my ($value) = $session->db->quickArray("select value from settings where name='inmate'");
is($value, '30265', "add()");
is($session->setting->get("inmate"), "30265", "get()");
$session->setting->set("inmate","37927");
my ($value) = $session->db->quickArray("select value from settings where name='inmate'");
is($value, '37927', "set()");
is($session->setting->get("inmate"), '37927', 'set() also updates object cache');
$session->setting->remove("inmate");
my ($value) = $session->db->quickArray("select value from settings where name='inmate'");
is($value, undef, "delete()");
isa_ok($session->setting->session, 'WebGUI::Session', 'session method returns a session object');