Changeset 34671

Timestamp:

09/28/2015 10:06:15 PM (9 years ago)

Author:

helen

Message:

Sample permalink: Buttons still need the .button class.

Also fixes unit tests post-[34670]. The test methods have been slightly renamed because it is no longer a button. Hopefully this name will be more future-proof.

see #18306.

Location:

trunk

Files:

• src/wp-admin/js/post.js (modified) (1 diff)
• tests/phpunit/tests/admin/includesPost.php (modified) (8 diffs)

trunk/src/wp-admin/js/post.js

@@ -742 +742 @@
         revert_e = e.html();
 
-        buttons.html('<button type="button" class="save button-small">'+postL10n.ok+'</button> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
+        buttons.html('<button type="button" class="save button button-small">'+postL10n.ok+'</button> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
         buttons.children('.save').click(function() {
             var new_slug = e.children('input').val();

trunk/tests/phpunit/tests/admin/includesPost.php

@@ -273 +273 @@
     /**
      * @ticket 30910
-     */
-    public function test_get_sample_permalink_html_should_use_default_permalink_for_view_post_button_when_pretty_permalinks_are_disabled() {
+     * @ticket 18306
+     */
+    public function test_get_sample_permalink_html_should_use_default_permalink_for_view_post_link_when_pretty_permalinks_are_disabled() {
         global $wp_rewrite;
         $old_permalink_structure = get_option( 'permalink_structure' );
@@ -286 +287 @@
 
         $found = get_sample_permalink_html( $p );
-        $this->assertContains( "span id='view-post-btn'><a href='" . get_option( 'home' ) . "/?p=$p'", $found );
+        $this->assertContains( 'href="' . get_option( 'home' ) . '/?p=' . $p . '"', $found );
 
         $wp_rewrite->set_permalink_structure( $old_permalink_structure );
@@ -294 +295 @@
     /**
      * @ticket 30910
-     */
-    public function test_get_sample_permalink_html_should_use_pretty_permalink_for_view_post_button_when_pretty_permalinks_are_enabled() {
+     * @ticket 18306
+     */
+    public function test_get_sample_permalink_html_should_use_pretty_permalink_for_view_post_link_when_pretty_permalinks_are_enabled() {
         global $wp_rewrite;
         $old_permalink_structure = get_option( 'permalink_structure' );
@@ -309 +311 @@
         $found = get_sample_permalink_html( $p );
         $post = get_post( $p );
-        $this->assertContains( "span id='view-post-btn'><a href='" . get_option( 'home' ) . "/" . $post->post_name . "/'", $found );
+        $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found );
 
         $wp_rewrite->set_permalink_structure( $old_permalink_structure );
@@ -317 +319 @@
     /**
      * @ticket 32954
-     */
-    public function test_get_sample_permalink_html_should_use_correct_permalink_for_view_post_button_when_changing_slug() {
+     * @ticket 18306
+     */
+    public function test_get_sample_permalink_html_should_use_correct_permalink_for_view_post_link_when_changing_slug() {
         global $wp_rewrite;
         $old_permalink_structure = get_option( 'permalink_structure' );
@@ -332 +335 @@
         $found = get_sample_permalink_html( $p, null, 'new_slug' );
         $post = get_post( $p );
-        $this->assertContains( "span id='view-post-btn'><a href='" . get_option( 'home' ) . "/" . $post->post_name . "/'", $found );
+        $message = 'Published post';
+        $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found, $message );
 
         // Scheduled posts should use published permalink
@@ -340 +344 @@
         $found = get_sample_permalink_html( $p, null, 'new_slug' );
         $post = get_post( $p );
-        $this->assertContains( "span id='view-post-btn'><a href='" . get_option( 'home' ) . "/" . $post->post_name . "/'", $found );
+        $message = 'Scheduled post';
+        $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found, $message );
 
         // Draft posts should use preview link
@@ -347 +352 @@
         $found = get_sample_permalink_html( $p, null, 'new_slug' );
         $post = get_post( $p );
+        $message = 'Draft post';
 
         $preview_link = get_permalink( $post->ID );
         $preview_link = add_query_arg( 'preview', 'true', $preview_link );
 
-        $this->assertContains( "span id='view-post-btn'><a href='" . esc_url( $preview_link ) . "'", $found );
+        $this->assertContains( 'href="' . esc_url( $preview_link ) . '"', $found, $message );
 
         $wp_rewrite->set_permalink_structure( $old_permalink_structure );