Changeset 5806

Timestamp:

08/16/2017 01:10:07 PM (7 years ago)

Author:

danielbachhuber

Message:

phpunit-test-reporter: Misc display changes

• Use rewrite rule hackery for consistent breadcrumbs
• Display test result timing when present
• Drop empty column from table view

See #2981

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/phpunit-test-reporter

Files:

• parts/result-set.php (modified) (3 diffs)
• parts/single-result.php (modified) (1 diff)
• src/class-content-model.php (modified) (1 diff)
• src/class-display.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/phpunit-test-reporter/parts/result-set.php

@@ -8 +8 @@
         <tr>
             <th style="width:100px">Revision</th>
-            <th style="width:100px">Status</th>
             <th>Host</th>
             <th>PHP Version</th>
@@ -17 +16 @@
     <tbody>
         <?php
-        $total_cols = 6;
+        $total_cols = 5;
         foreach ( $revisions as $revision ) :
             $rev_id = (int) ltrim( $revision->post_name, 'r' );
@@ -50 +49 @@
                     ?>
                 <tr>
-                    <td></td>
-                    <td><a href="<?php echo esc_url( get_permalink( $report->ID ) ); ?>" title="<?php echo esc_attr( $status_title ); ?>" class="<?php echo esc_attr( 'ptr-status-badge ptr-status-badge-' . strtolower( $status ) ); ?>"><?php echo esc_html( $status ); ?></a></td>
+                    <td><a href="<?php echo esc_url( get_permalink( $report->ID ) ); ?>" title="<?php echo esc_attr( $status_title ); ?>" class="<?php echo esc_attr( 'ptr-status-badge ptr-status-badge-' . strtolower( $status ) ); ?>"><?php echo esc_html( $status ); ?></a>
+                    <?php
+                    $display_time = Display::get_display_time( $report->ID );
+                    if ( $display_time ) :
+                    ?>
+                        <br /><small><?php echo esc_html( $display_time ); ?></small>
+                    <?php endif; ?>
+                    </td>
                     <td><?php echo esc_html( $host ); ?></td>
                     <td><?php echo esc_html( Display::get_display_php_version( $report->ID ) ); ?></td>

sites/trunk/wordpress.org/public_html/wp-content/plugins/phpunit-test-reporter/parts/single-result.php

@@ -24 +24 @@
 <?php endif; ?>
 
-<p><a href="<?php echo esc_url( get_permalink( $report->ID ) ); ?>" title="<?php echo esc_attr( $status_title ); ?>" class="<?php echo esc_attr( 'ptr-status-badge ptr-status-badge-' . strtolower( $status ) ); ?>"><?php echo esc_html( $status ); ?></a></p>
+<p><a href="<?php echo esc_url( get_permalink( $report->ID ) ); ?>" title="<?php echo esc_attr( $status_title ); ?>" class="<?php echo esc_attr( 'ptr-status-badge ptr-status-badge-' . strtolower( $status ) ); ?>"><?php echo esc_html( $status ); ?></a>
+<?php
+$display_time = Display::get_display_time( $report->ID );
+if ( $display_time ) :
+?>
+    <br /><small><?php echo esc_html( $display_time ); ?></small>
+<?php endif; ?>
+</p>
 
 <h2>Environment</h2>

sites/trunk/wordpress.org/public_html/wp-content/plugins/phpunit-test-reporter/src/class-content-model.php

@@ -17 +17 @@
                 ),
                 'public' => true,
-                'has_archive' => true,
+                'has_archive' => false,
                 'show_in_rest' => true,
                 'hierarchical' => true,
+                'rewrite' => array(
+                    'slug' => 'test-results',
+                ),
                 'supports' => array(
                     'title',

sites/trunk/wordpress.org/public_html/wp-content/plugins/phpunit-test-reporter/src/class-display.php

@@ -42 +42 @@
                 ),
             ) );
+            $content = '<p><a href="' . esc_url( home_url( 'test-results/' ) ) . '">&larr; Test Results</a></p>' . PHP_EOL . PHP_EOL . $content;
         }
 
@@ -122 +123 @@
         <?php
         return ob_get_clean();
+    }
+
+    /**
+     * Get the time for display
+     *
+     * @return string
+     */
+    public static function get_display_time( $report_id ) {
+        $results = get_post_meta( $report_id, 'results', true );
+        if ( empty( $results['time'] ) ) {
+            return '';
+        }
+        $minutes = floor( ( (int) $results['time'] / 60 ) % 60 );
+        $seconds = (int) $results['time'] % 60;
+        return "{$minutes}m {$seconds}s";
     }