From a3266dea35e387516c5db39b5581b3856d959709 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 4 Nov 2011 14:13:22 -0700 Subject: [PATCH] WebGUI 8 doesn't do Basic Auth, and ldap tests were moved into a different file. --- t/Auth/mech.t | 8 -------- t/Group.t | 55 --------------------------------------------------- 2 files changed, 63 deletions(-) diff --git a/t/Auth/mech.t b/t/Auth/mech.t index 727218fdc..943e90176 100644 --- a/t/Auth/mech.t +++ b/t/Auth/mech.t @@ -266,12 +266,4 @@ $mech->submit_form_ok( ); $mech->base_is( $assetUrl, "We don't get redirected" ); -#---------------------------------------------------------------------------- -# HTTP basic auth -$mech = Test::WWW::Mechanize->new; -$mech->get( $httpAuthUrl ); -$mech->content_contains( "Hello, $USERNAME", "We are greeted by name" ); -$mech->get( $httpAuthUrl . $asset->get('url') ); -$mech->content_contains( "ARTICLE", "We are shown the article" ); - done_testing; diff --git a/t/Group.t b/t/Group.t index 3234c6682..e8a0cf232 100644 --- a/t/Group.t +++ b/t/Group.t @@ -155,61 +155,6 @@ my $getGroupsIn = $optionGroup->getGroupsIn(); cmp_deeply($getGroupsIn, [], 'new: noAdmin prevents the admin group from being added to this group'); $optionGroup->delete; -################################################################ -# -# LDAP specific group properties -# These tests have to be done on an isolated group that will NEVER -# have getGroups called on it -# -################################################################ - -my $ldapProps = WebGUI::Test->getSmokeLDAPProps(); -$session->db->setRow('ldapLink', 'ldapLinkId', $ldapProps, $ldapProps->{ldapLinkId}); -my $ldap = WebGUI::LDAPLink->new($session, $ldapProps->{ldapLinkId}); -is($ldap->getValue("ldapLinkId"),$ldapProps->{ldapLinkId},'ldap link created properly'); -WebGUI::Test->addToCleanup($ldap); - -my @shawshank; - -foreach my $idx (0..$#ldapTests) { - $shawshank[$idx] = WebGUI::User->new($session, "new"); - $shawshank[$idx]->username("shawshank$idx"); - $shawshank[$idx]->authMethod("LDAP"); - my $auth = $shawshank[$idx]->authInstance; - $auth->saveParams($shawshank[$idx]->getId,$shawshank[$idx]->authMethod,{ - connectDN => $ldapTests[$idx]->{dn}, - ldapConnection => $ldap->getValue("ldapLinkId"), - ldapUrl => $ldap->getValue("ldapUrl"), - }); -} - -WebGUI::Test->addToCleanup(@shawshank); - -my $lGroup = WebGUI::Group->new($session, 'new'); - -$lGroup->ldapGroup('cn=Convicts,o=shawshank'); -is($lGroup->ldapGroup(), 'cn=Convicts,o=shawshank', 'ldapGroup set and fetched correctly'); - -$lGroup->ldapGroupProperty('member'); -is($lGroup->ldapGroupProperty(), 'member', 'ldapGroup set and fetched correctly'); - -$lGroup->ldapLinkId($ldapProps->{ldapLinkId}); -is($lGroup->ldapLinkId(),$ldapProps->{ldapLinkId}, 'ldapLinkId set and fetched correctly'); - -is_deeply( - [ (map { $lGroup->hasLDAPUser($_->getId) } @shawshank) ], - [0, 1, 1], - 'shawshank user 2, and 3 found in lGroup users from LDAP' -); - -$lGroup->ldapRecursiveProperty('LDAP recursive property'); -is($lGroup->ldapRecursiveProperty(), 'LDAP recursive property', 'ldapRecursiveProperty set and fetched correctly'); - -$lGroup->ldapRecursiveFilter('LDAP recursive filter'); -is($lGroup->ldapRecursiveFilter(), 'LDAP recursive filter', 'ldapRecursiveFilter set and fetched correctly'); - -$lGroup->delete; - my $gid = $g->getId; is (length($gid), 22, "GroupId is proper length");