Merge pull request metacpan#434 from CPAN-API/oalders/fix-tests

Oalders/fix tests

Author: ranguard

lib/MetaCPAN/Document/File.pm

@@ -265,7 +265,8 @@ has documentation => (
 sub _build_documentation {
     my $self = shift;
     $self->_build_abstract;
-    my $documentation = $self->documentation if ( $self->has_documentation );
+    my $documentation
+        = $self->has_documentation ? $self->documentation : undef;
     return undef unless ( ${ $self->pod } );
     my @indexed = grep { $_->indexed } @{ $self->module || [] };
     if ( $documentation && $self->is_pod_file ) {

lib/MetaCPAN/Script/Release.pm

@@ -143,14 +143,12 @@ sub run {
     $self->perms;
     my @pid;
 
-    # FIXME: What is this supposed to do?  Don't do 'my' in a condition.
-    my $cpan = $self->index if ( $self->skip );
     eval { DB::enable_profile() };
     while ( my $file = shift @files ) {
 
         if ( $self->skip ) {
             my $d     = CPAN::DistnameInfo->new($file);
-            my $count = $cpan->type('release')->filter(
+            my $count = $self->index->type('release')->filter(
                 {
                     and => [
                         { term => { archive => $d->filename } },

t/release/weblint++-1.15.t

@@ -28,10 +28,8 @@ test_release(
             my ($self) = @_;
 
             {
-                local $TODO
-                    = 'Should we be stripping the ++ from the distribution?';
-                is $self->data->distribution, 'weblint++',
-                    'distribution matches META name';
+                is $self->data->distribution, 'weblint',
+                    'distribution matches META name, but strips out ++';
             }
         },
     }