[Rt-commit] r19114 - in rt/3.999/branches/FTS: . etc share/html/Admin/Global share/html/Approvals/Elements share/html/Ticket t/api t/lorzy t/maildigest tools
ruz at bestpractical.com
ruz at bestpractical.com
Thu Apr 9 10:46:16 EDT 2009
Author: ruz
Date: Thu Apr 9 10:46:16 2009
New Revision: 19114
Added:
rt/3.999/branches/FTS/t/lorzy/error.t
Modified:
rt/3.999/branches/FTS/ (props changed)
rt/3.999/branches/FTS/Makefile.PL
rt/3.999/branches/FTS/etc/config.yml
rt/3.999/branches/FTS/share/html/Admin/Global/Scrip.html
rt/3.999/branches/FTS/share/html/Admin/Queues/Scrip.html
rt/3.999/branches/FTS/share/html/Approvals/Elements/PendingMyApproval
rt/3.999/branches/FTS/share/html/Ticket/Forward.html
rt/3.999/branches/FTS/t/api/date.t
rt/3.999/branches/FTS/t/api/searchbuilder.t
rt/3.999/branches/FTS/t/maildigest/attributes.t
rt/3.999/branches/FTS/tools/shipwright-package
Log:
* sync from trunk
Modified: rt/3.999/branches/FTS/Makefile.PL
==============================================================================
--- rt/3.999/branches/FTS/Makefile.PL (original)
+++ rt/3.999/branches/FTS/Makefile.PL Thu Apr 9 10:46:16 2009
@@ -4,6 +4,7 @@
version '3.999_01';
license 'GPLv2';
requires 'Jifty' => '0.80913';
+test_requires 'Test::MockTime';
requires(
'Digest::base' => 0,
Modified: rt/3.999/branches/FTS/etc/config.yml
==============================================================================
--- rt/3.999/branches/FTS/etc/config.yml (original)
+++ rt/3.999/branches/FTS/etc/config.yml Thu Apr 9 10:46:16 2009
@@ -8,7 +8,7 @@
Database:
CheckSchema: 0
Database: rt4
- Driver: mysql
+ Driver: SQLite
Host: localhost
Password: ''
RecordBaseClass: Jifty::DBI::Record::Cachable
Modified: rt/3.999/branches/FTS/share/html/Admin/Global/Scrip.html
==============================================================================
--- rt/3.999/branches/FTS/share/html/Admin/Global/Scrip.html (original)
+++ rt/3.999/branches/FTS/share/html/Admin/Global/Scrip.html Thu Apr 9 10:46:16 2009
@@ -69,7 +69,6 @@
},
};
-my $scrip = RT::Model::Scrip->new( current_user => Jifty->web->current_user );
my ($id, @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS );
my ($title, $current_subtab);
Modified: rt/3.999/branches/FTS/share/html/Admin/Queues/Scrip.html
==============================================================================
--- rt/3.999/branches/FTS/share/html/Admin/Queues/Scrip.html (original)
+++ rt/3.999/branches/FTS/share/html/Admin/Queues/Scrip.html Thu Apr 9 10:46:16 2009
@@ -77,7 +77,6 @@
},
};
-my $scrip = RT::Model::Scrip->new( current_user => Jifty->web->current_user );
($id, my @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS );
if ( $id ) {
Modified: rt/3.999/branches/FTS/share/html/Approvals/Elements/PendingMyApproval
==============================================================================
--- rt/3.999/branches/FTS/share/html/Approvals/Elements/PendingMyApproval (original)
+++ rt/3.999/branches/FTS/share/html/Approvals/Elements/PendingMyApproval Thu Apr 9 10:46:16 2009
@@ -63,9 +63,9 @@
<input type="checkbox" class="checkbox" value="1" name="show_rejected" <% defined($ARGS{'show_rejected'}) && $ARGS{'show_rejected'} && qq[checked="checked"] |n%> /> <&|/l&>Show denied requests</&><br />
<input type="checkbox" class="checkbox" value="1" name="show_dependent" <% defined($ARGS{'show_dependent'}) && $ARGS{'show_dependent'} && qq[checked="checked"] |n%> /> <&|/l&>Show requests awaiting other approvals</&><br />
-<&|/l,"<input size='15' value='".($Created_before->epoch > 0 &&$Created_before->iso)."' name='created_before' id='CreatedBefore' class='datetime' />"&>Only show approvals for requests Created before %1</&><br />
+<&|/l,"<input size='15' value='".($created_before->epoch > 0 &&$created_before->iso)."' name='created_before' id='CreatedBefore' class='datetime' />"&>Only show approvals for requests Created before %1</&><br />
-<&|/l, "<input size='15' value='".( $Created_after->epoch >0 && $Created_after->iso)."' name='created_after' id='CreatedAfter' class='datetime' />"&>Only show approvals for requests Created after %1</&>
+<&|/l, "<input size='15' value='".( $created_after->epoch >0 && $created_after->iso)."' name='created_after' id='CreatedAfter' class='datetime' />"&>Only show approvals for requests Created after %1</&>
</&>
<%init>
Modified: rt/3.999/branches/FTS/share/html/Ticket/Forward.html
==============================================================================
--- rt/3.999/branches/FTS/share/html/Ticket/Forward.html (original)
+++ rt/3.999/branches/FTS/share/html/Ticket/Forward.html Thu Apr 9 10:46:16 2009
@@ -99,7 +99,7 @@
if ( $forward_and_return ) {
my $key = Digest::MD5::md5_hex(rand(1024));
- Jifty->web->session->set( "actions_$key" => \@Actions );
+ Jifty->web->session->set( "actions_$key" => \@results );
RT::Interface::Web::redirect( RT->config->get('WebURL') ."Ticket/Display.html?id=". $id."&results=".$key);
}
}
Modified: rt/3.999/branches/FTS/t/api/date.t
==============================================================================
--- rt/3.999/branches/FTS/t/api/date.t (original)
+++ rt/3.999/branches/FTS/t/api/date.t Thu Apr 9 10:46:16 2009
@@ -4,7 +4,7 @@
use Test::MockTime qw(set_fixed_time restore_time);
use RT::Test;
-use Test::More tests => 93;
+use Test::More tests => 94;
use RT::Model::User;
use Test::Warn;
@@ -218,6 +218,7 @@
{
RT->config->set( TimeZone => 'Europe/Moscow' );
my $date = RT::DateTime->new_from_string('2005-11-28 15:10:00');
+ is($date->time_zone->name, 'Europe/Moscow');
is($date->iso, '2005-11-28 15:10:00', "YYYY-DD-MM hh:mm:ss");
$date = RT::DateTime->new_from_string('2005-11-28 15:10:00', time_zone => 'UTC' );
@@ -293,7 +294,7 @@
{ # age
my $date = RT::DateTime->now(current_user => RT->system_user);
my $diff = $date->age;
- like($diff, qr/^(0 sec|[1-5] sec ago)$/, 'close enought');
+ like($diff, qr/^(0 sec|[1-5] sec ago)$/, 'close enough');
}
#TODO: AsString
Modified: rt/3.999/branches/FTS/t/api/searchbuilder.t
==============================================================================
--- rt/3.999/branches/FTS/t/api/searchbuilder.t (original)
+++ rt/3.999/branches/FTS/t/api/searchbuilder.t Thu Apr 9 10:46:16 2009
@@ -9,7 +9,7 @@
{
-ok (require RT::SearchBuilder);
+ok (require RT::Collection);
}
Added: rt/3.999/branches/FTS/t/lorzy/error.t
==============================================================================
--- (empty file)
+++ rt/3.999/branches/FTS/t/lorzy/error.t Thu Apr 9 10:46:16 2009
@@ -0,0 +1,44 @@
+use Test::More tests => 3;
+use RT::Test;
+
+use strict;
+use warnings;
+
+use RT::Model::Queue;
+use RT::Model::User;
+use RT::Model::Group;
+use RT::Model::Ticket;
+use RT::Model::ACE;
+use RT::CurrentUser;
+use Test::Exception;
+
+use_ok('Lorzy');
+
+my $eval = Lorzy::Evaluator->new();
+$eval->load_package($_) for qw(Str Native);
+
+my $queue = RT::Model::Queue->new(current_user => RT->system_user);
+my ($queue_id) = $queue->create( name => 'lorzy');
+ok( $queue_id, 'queue created' );
+
+my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
+my ($rv, $msg) = $ticket->create( subject => 'watcher tests', queue => $queue->name );
+
+use RT::Lorzy;
+
+$YAML::Syck::UseCode = $YAML::UseCode = 1;
+my $rule = RT::Model::Rule->new( current_user => RT->system_user );
+$rule->create_from_factory(
+ RT::Lorzy::RuleFactory->make_factory
+ ( { condition => sub { die 'condition fail' },
+ description => 'test fail action',
+ _stage => 'transaction_create',
+ action => sub { $_[0]->{context}{hints}{run}++ } } )
+);
+
+my ($txn_id, $tmsg, $txn) = $ticket->comment(content => 'lorzy lorzy in the code');
+my ($this_rule) = grep { $_->description eq 'test fail action'} @{$txn->rules};
+
+ok(!$this_rule, 'not running failing condition rules');
+
+
Modified: rt/3.999/branches/FTS/t/maildigest/attributes.t
==============================================================================
--- rt/3.999/branches/FTS/t/maildigest/attributes.t (original)
+++ rt/3.999/branches/FTS/t/maildigest/attributes.t Thu Apr 9 10:46:16 2009
@@ -151,7 +151,16 @@
my $pattern = shift;
my $perl = $^X . ' ' . join ' ', map { "-I$_" } grep { not ref } @INC;
- open my $digester, "-|", "$perl $RT::SbinPath/rt-email-digest $arg";
+ my $rt_email_digest;
+
+# to get around shipwright vessel
+ if ( -e "$RT::SbinPath-wrapped/rt-email-digest" ) {
+ $rt_email_digest = "$RT::SbinPath-wrapped/rt-email-digest";
+ }
+ else {
+ $rt_email_digest = "$RT::SbinPath/rt-email-digest";
+ }
+ open my $digester, "-|", "$perl $rt_email_digest $arg";
my @results = <$digester>;
my $content = join '', @results;
if ( ref $pattern && ref $pattern eq 'Regexp' ) {
Modified: rt/3.999/branches/FTS/tools/shipwright-package
==============================================================================
--- rt/3.999/branches/FTS/tools/shipwright-package (original)
+++ rt/3.999/branches/FTS/tools/shipwright-package Thu Apr 9 10:46:16 2009
@@ -20,6 +20,9 @@
$IMPORT http://www.libgd.org/releases/gd-2.0.35.tar.gz --build-script=/tmp/shipwright_gd_build
+# import graphviz
+$IMPORT http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.22.2.tar.gz
+
# import mysql and Pg
echo 'configure: ./configure --prefix=%%INSTALL_BASE%% --without-server --without-docs --without-man
make: %%MAKE%%
@@ -59,6 +62,7 @@
shipwright update -r $SVN_PATH cpan-GD --add-deps gd
shipwright update -r $SVN_PATH gd --add-deps libpng
shipwright update -r $SVN_PATH libpng --add-deps zlib
+shipwright update -r $SVN_PATH cpan-GraphViz --add-deps graphviz
shipwright maintain -r $SVN_PATH --update-order
shipwright flags -r $SVN_PATH mysql --add mysql
@@ -75,10 +79,16 @@
# DBD-... will try to connect server, which may result in test failure
shipwright ktf -r $SVN_PATH cpan-DBD-mysql --set 1
shipwright ktf -r $SVN_PATH cpan-DBD-Pg --set 1
+shipwright ktf -r $SVN_PATH cpan-PAR-Dist --set 1
+shipwright ktf -r $SVN_PATH cpan-WWW-Mechanize --set 1
+shipwright ktf -r $SVN_PATH cpan-Test-WWW-Mechanize --set 1
+shipwright ktf -r $SVN_PATH cpan-MIME-tools --set 1
+
+echo 'RT: cd %%INSTALL_BASE%% && PERL5LIB=lib:lib/perl5 bin/prove -r t' > /tmp/shipwright_test
+shipwright import -r $SVN_PATH --test-script /tmp/shipwright_test
cd /tmp
rm -rf rtex-$$
svn export file://$REPO /tmp/rtex-$$
#rsync -rvp /tmp/rtex/ jesse at fsck.com:/tmp/rtex-$$
-echo "cd /tmp/rtex-$$; ./bin/shipwright-builder "
-
+echo "cd /tmp/rtex-$$; ./bin/shipwright-builder; ./bin/shipwright-builder --only-test"
More information about the Rt-commit
mailing list