From 26f7dd8bca945f412c06b29ce2f94d8087c1f764 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 2 Oct 2009 14:09:06 -0700
Subject: [PATCH] Bug #11082: Admin group has been removed from Visitor Group.

---
 docs/changelog/7.x.x.txt             |  1 +
 docs/upgrades/upgrade_7.8.0-7.8.1.pl | 18 ++++++++++++++++++
 t/Group.t                            |  6 +-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 31f97fa8c..bdddcb11d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -36,6 +36,7 @@
  - fixed #10544: Child assets under uncommitted parents
  - fixed failure in test 250 of t/00_compile.t
  - fixed #11084: option to view private profiles
+ - fixed #11082: Admin group in Visitor group?
 
 7.8.0
  - upgraded YUI to 2.8.0r4
diff --git a/docs/upgrades/upgrade_7.8.0-7.8.1.pl b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
index 73529e4c0..54c1d4959 100644
--- a/docs/upgrades/upgrade_7.8.0-7.8.1.pl
+++ b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
@@ -37,6 +37,7 @@ removeOldITransactTables( $session );
 removeSQLFormTables( $session );
 fixBadRevisionDateColumns( $session );
 removeImportCruft( $session );
+removeAdminFromVisitorGroup( $session );
 
 finish($session); # this line required
 
@@ -50,6 +51,7 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub fixBadRevisionDateColumns {
     my $session = shift;
@@ -62,6 +64,7 @@ sub fixBadRevisionDateColumns {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub removeSQLFormTables {
     my $session = shift;
@@ -74,6 +77,7 @@ sub removeSQLFormTables {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub removeOldSubscriptionTables {
     my $session = shift;
@@ -84,6 +88,7 @@ sub removeOldSubscriptionTables {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub removeOldITransactTables {
     my $session = shift;
@@ -92,6 +97,17 @@ sub removeOldITransactTables {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub removeAdminFromVisitorGroup {
+    my $session = shift;
+    print "\tRemoving Admin group from Visitor group... " unless $quiet;
+    $session->db->write("delete from groupGroupings where groupId='3' and inGroup='1'");
+    print "Done.\n" unless $quiet;
+}
+
+
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub fixWikis {
     my $session = shift;
@@ -101,6 +117,7 @@ sub fixWikis {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub fixEMSTemplates {
     my $session = shift;
@@ -110,6 +127,7 @@ sub fixEMSTemplates {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub removeImportCruft {
     my $session = shift;
diff --git a/t/Group.t b/t/Group.t
index 61dd929e3..d1cf801c4 100644
--- a/t/Group.t
+++ b/t/Group.t
@@ -75,7 +75,7 @@ my @ipTests = (
 );
 
 
-plan tests => (152 + scalar(@scratchTests) + scalar(@ipTests)); # increment this value for each test you create
+plan tests => (151 + scalar(@scratchTests) + scalar(@ipTests)); # increment this value for each test you create
 
 my $session = WebGUI::Test->session;
 my $testCache = WebGUI::Cache->new($session, 'myTestKey');
@@ -660,10 +660,6 @@ ok( !$cacheDude->isInGroup($gB->getId), "Cache dude is not a member of group B")
 
 ##Admin group inclusion check.
 
-my $vgroup = WebGUI::Group->new($session, 1);
-my $vgroups = $vgroup->getGroupsIn();
-ok( isIn(3, @{ $vgroups }), 'Admin Group is in Group Visitor');
-
 SKIP: {
 	skip("need to test expiration date in groupings interacting with recursive or not", 1);
 	ok(undef, "expiration date in groupings for getUser");