oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test fixes for cross repo-mixup.

Browse source
This commit is contained in:
Colin Kuskie 2010-06-26 13:07:53 -07:00
parent 5febc0ebbc
commit 55ec1788ed
7 changed files with 5 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
t/Asset/File/GalleryFile/Photo/view.t
View file

@ -128,9 +128,6 @@ my $testTemplateVars = {
lastFile_thumbnailUrl
=> $nextPhoto->getThumbnailUrl,
lastFile_title => $nextPhoto->get("title"),
ownerAlias => 'Admin',
ownerId => '3',
ownerProfileUrl => '/?op=account;module=profile;do=view;uid=3',
};
# Ignore all EXIF tags, they're tested in exif.t

4
t/Asset/Story.t
View file

@ -274,11 +274,9 @@ cmp_deeply(
{
title => 'Story 1',
description => 'WebGUI was originally called Web Done Right.',
'link' => all(re('^'.$session->url->getSiteURL),re('story-1$')),
guid => re('story-1$'),
'link' => re('story-1$'),
author => 'JT Smith',
date => $story->lastModified,
pubDate => $session->datetime->epochToMail($story->get('creationDate')),
},
'getRssData: returns correct data'
);

6
t/Asset/Wobject/StoryArchive.t
View file

@ -548,8 +548,6 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
{
title => 'Story 2',
@ -557,8 +555,6 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
{
title => 'Story 3',
@ -566,8 +562,6 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
],
'rssFeedItems'

6
t/Asset/Wobject/StoryTopic.t
View file

@ -297,8 +297,6 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
{
title => 'red',
@ -306,8 +304,6 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
{
title => 'brooks',
@ -315,8 +311,6 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
],
'rssFeedItems'

2
t/Macro/PickLanguage.t
View file

@ -54,7 +54,6 @@ $templateMock->mock('process', sub { $templateVars = $_[1]; } );
'language_langAbbr' => 'en',
'language_langAbbrLoc' => 'US',
'language_langEng' => 'English',
'language_isCurrent' => '1',
},
],
delete_url => '?op=setLanguage;language=delete;',
@ -83,7 +82,6 @@ $templateMock->mock('process', sub { $templateVars = $_[1]; } );
'language_langAbbr' => 'en',
'language_langAbbrLoc' => 'US',
'language_langEng' => 'English',
'language_isCurrent' => '1',
},
],
delete_url => '?op=setLanguage;language=delete;',

8
t/Storage.t
View file

@ -68,8 +68,8 @@ is( $storage1->getLastError, undef, "No errors during path creation");
#
####################################################
is( $storage1->getPathFrag, '7e/8a/7e8a1b6ab', 'pathFrag returns correct value');
is( $storage1->getDirectoryId, '7e8a1b6ab', 'getDirectoryId returns the last path element');
is( $storage1->getPathFrag, '7e/8a/7e8a1b6a', 'pathFrag returns correct value');
is( $storage1->getDirectoryId, '7e8a1b6a', 'getDirectoryId returns the last path element');
##Build an old-style GUID storage location
my $uploadsBase = Path::Class::Dir->new($uploadDir);
@ -94,12 +94,12 @@ is($guidStorage->getDirectoryId, $newGuid, '... getDirectoryId');
$session->config->delete('cdn');
# Note: the CDN configuration will be reverted after CDN tests below
my $storageDir1 = join '/', $uploadDir, '7e', '8a', '7e8a1b6ab';
my $storageDir1 = join '/', $uploadDir, '7e', '8a', '7e8a1b6a';
is ($storage1->getPath, $storageDir1, 'getPath: path calculated correctly for directory');
my $storageFile1 = join '/', $storageDir1, 'baz';
is ($storage1->getPath('baz'), $storageFile1, 'getPath: path calculated correctly for file');
my $storageUrl1 = join '/', $uploadUrl, '7e', '8a', '7e8a1b6ab';
my $storageUrl1 = join '/', $uploadUrl, '7e', '8a', '7e8a1b6a';
is ($storage1->getUrl, $storageUrl1, 'getUrl: url calculated correctly for directory');
my $storageUrl2 = join '/', $storageUrl1, 'bar';
is ($storage1->getUrl('bar'), $storageUrl2, 'getUrl: url calculated correctly for file');

2
t/tests/Test/WebGUI/Asset.pm
View file

@ -42,7 +42,6 @@ sub getAnchoredAsset {
$a = $a->cloneFromDb;
}
WebGUI::Test->addToCleanup($tag);
warn "returning data";
return ($tag, $asset, @parents);
}
@ -274,7 +273,6 @@ sub t_05_cut_paste : Test(5) {
my $session = $test->session;
my ($tag, $asset, @parents) = $test->getAnchoredAsset();
ok $asset->cut, 'cut returns true if it was cut';
ok $asset->cut, 'cut returns true if it was cut';
is $asset->state, 'clipboard', 'asset state updated';
my $session_asset = $session->asset();
$session->asset($parents[-1]);