[dw-free] fix notificationmethod tests

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/d038eb85ba69]

http://bugs.dwscoalition.org/show_bug.cgi?id=2491

Fix notification method tests.

Patch by kareila.

Files modified:

• t/notificationmethod-email.t
• t/notificationmethod-inbox.t

--------------------------------------------------------------------------------
diff -r 7645e66a60af -r d038eb85ba69 t/notificationmethod-email.t
--- a/t/notificationmethod-email.t	Tue Apr 20 09:23:26 2010 +0000
+++ b/t/notificationmethod-email.t	Tue Apr 20 09:24:46 2010 +0000
@@ -7,11 +7,10 @@ require 'ljlib.pl';
 
 use LJ::Test qw(temp_user memcache_stress);
 
-#plan tests =>;
-plan skip_all => 'Fix this test! LJ/Event/Befriended.pm is missing';
+plan tests => 69;
 
 use LJ::NotificationMethod::Email;
-#use LJ::Event::Befriended;
+use LJ::Event::AddedToCircle;
 
 my $u;
 my $valid_u = sub {
@@ -33,7 +32,7 @@ sub LJ::send_mail {
     # check for correct fields
     is($opts->{to}, $u->email_raw, "Email address");
     is($opts->{from}, $LJ::BOGUS_EMAIL, "From address");
-    like($opts->{body}, qr/.+ has added you/i, "Body");
+    like($opts->{body}, qr/.+ has subscribed to you/i, "Body");
 
     return 1;
 }
@@ -101,9 +100,9 @@ sub run_tests{
 
         my $ev;
 
-        my $fromu = $u; # yeah, you can friend yourself
-        $ev = LJ::Event::Befriended->new($u, $fromu);
-        ok(ref $ev && ! $@, "created LJ::Event::Befriended object");
+        my $fromu = $u; # yeah, you can watch yourself
+        $ev = LJ::Event::AddedToCircle->new( $u, $fromu, 2 );
+        ok(ref $ev && ! $@, "created LJ::Event::AddedToCircle object");
 
         # failures
         eval { LJ::NotificationMethod::Email::notify() };
diff -r 7645e66a60af -r d038eb85ba69 t/notificationmethod-inbox.t
--- a/t/notificationmethod-inbox.t	Tue Apr 20 09:23:26 2010 +0000
+++ b/t/notificationmethod-inbox.t	Tue Apr 20 09:24:46 2010 +0000
@@ -7,11 +7,10 @@ require 'ljlib.pl';
 
 use LJ::Test qw(temp_user memcache_stress);
 
-#plan tests =>;
-plan skip_all => 'Fix this test! LJ/Event/Befriended.pm is missing';
+plan tests => 45;
 
 use LJ::NotificationMethod::Inbox;
-#use LJ::Event::Befriended;
+use LJ::Event::AddedToCircle;
 
 my $u;
 my $valid_u = sub {
@@ -73,9 +72,9 @@ sub run_tests{
 
         my $ev;
 
-        my $fromu = $u; # yeah, you can friend yourself
-        $ev = LJ::Event::Befriended->new($u, $fromu);
-        ok(ref $ev && ! $@, "created LJ::Event::Befriended object");
+        my $fromu = $u; # yeah, you can watch yourself
+        $ev = LJ::Event::AddedToCircle->new( $u, $fromu, 2 );
+        ok(ref $ev && ! $@, "created LJ::Event::AddedToCircle object");
 
         # failures
         eval { LJ::NotificationMethod::Inbox::notify() };
--------------------------------------------------------------------------------