[dw-free] fix t/console-tags.t

[afuna]

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

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

Fix test: adjust test input and expected output.

Patch by yvi and kareila.

Files modified:

• t/console-tags.t

--------------------------------------------------------------------------------
diff -r b2a762d1045f -r 4a28a5ddda9c t/console-tags.t
--- a/t/console-tags.t	Wed Jan 20 15:39:43 2010 +0000
+++ b/t/console-tags.t	Wed Jan 20 15:51:43 2010 +0000
@@ -7,8 +7,7 @@ use LJ::Test qw (temp_user temp_comm);
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
 
-#plan tests => 13;
-plan skip_all => 'Fix this test';
+plan tests => 13;
 
 my $u = temp_user();
 my $comm = temp_comm();
@@ -31,42 +30,38 @@ LJ::clear_rel($comm2, $u, 'A');
 # ----------- TAG DISPLAY --------------------------
 is($run->("tag_display tagtest 1"),
    "error: Error changing tag value. Please make sure the specified tag exists.");
+
 LJ::Tags::create_usertag($u, "tagtest", { display => 1 });
 is($run->("tag_display tagtest 1"),
    "success: Tag display value updated.");
-
 is($run->("tag_display for " . $comm->user . " tagtest 1"),
    "error: Error changing tag value. Please make sure the specified tag exists.");
+
 LJ::Tags::create_usertag($comm, "tagtest", { display => 1 });
 is($run->("tag_display for " . $comm->user . " tagtest 1"),
    "success: Tag display value updated.");
-
 is($run->("tag_display for " . $comm2->user . " tagtest 1"),
    "error: You cannot change tag display settings for " . $comm2->user);
 
 
 # ----------- TAG PERMISSIONS -----------------------
 $u->set_prop("opt_tagpermissions", undef);
-is($run->("tag_permissions friends friends"), "success: Tag permissions updated for " . $u->user);
+is($run->("tag_permissions access access"), "success: Tag permissions updated for " . $u->user);
 
 $u = LJ::load_user($u->user);
-is($u->raw_prop("opt_tagpermissions"), "friends,friends", "Tag permissions set correctly.");
-
-is($run->("tag_permissions friend friend"),
-   "error: Levels must be one of: 'private', 'public', 'friends', or the name of a friends group.");
-
+is($u->raw_prop("opt_tagpermissions"), "protected,protected", "Tag permissions set correctly.");
+is($run->("tag_permissions members members"),
+   "error: Levels must be one of: 'private', 'public', 'none', 'access' (for personal journals), 'members' (for communities), or the name of a custom group.");
 $comm->set_prop("opt_tagpermissions", undef);
-is($run->("tag_permissions for " . $comm->user . " friends friends"),
+is($run->("tag_permissions for " . $comm->user . " public members"),
    "success: Tag permissions updated for " . $comm->user);
 
 $comm = LJ::load_user($comm->user);
-is($comm->raw_prop("opt_tagpermissions"), "friends,friends", "Tag permissions set correctly.");
-
-is($run->("tag_permissions " . $comm->user . " friends friends"),
+is($comm->raw_prop("opt_tagpermissions"), "public,protected", "Tag permissions set correctly.");
+is($run->("tag_permissions " . $comm->user . " members members"),
    "error: This command takes either two or four arguments. Consult the reference.");
-
-is($run->("tag_permissions fo " . $comm->user . " friends friends"),
+is($run->("tag_permissions fo " . $comm->user . " members members"),
    "error: Invalid arguments. First argument must be 'for'");
 
-is($run->("tag_permissions for " . $comm2->user . " friends friends"),
+is($run->("tag_permissions for " . $comm2->user . " members members"),
    "error: You cannot change tag permission settings for " . $comm2->user);
--------------------------------------------------------------------------------