Skip to:
Content

bbPress.org

Changeset 6802


Ignore:
Timestamp:
04/22/2018 08:52:38 PM (8 years ago)
Author:
johnjamesjacoby
Message:

Tests: remove slashes from unpretty URLs before # anchor links.

Location:
trunk/tests/phpunit/testcases
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/testcases/replies/template/reply.php

    r6721 r6802  
    116116
    117117        // 1st reply is on the first page, 3 replies and 1 topic per page.
    118         $reply_url = bbp_get_topic_permalink( $t ) . '/#post-' . bbp_get_reply_id( $r[0] );
     118        $reply_url = bbp_get_topic_permalink( $t ) . '#post-' . bbp_get_reply_id( $r[0] );
    119119        $this->assertSame( $reply_url, bbp_get_reply_url( $r[0] ) );
    120120
    121121        // 2nd reply is on the first page, 3 replies and 1 topic per page.
    122         $reply_url = bbp_get_topic_permalink( $t ) . '/#post-' . bbp_get_reply_id( $r[1] );
     122        $reply_url = bbp_get_topic_permalink( $t ) . '#post-' . bbp_get_reply_id( $r[1] );
    123123        $this->assertSame( $reply_url, bbp_get_reply_url( $r[1] ) );
    124124
    125125        // 3rd reply is on the first page, 3 replies and 1 topic per page.
    126         $reply_url = bbp_get_topic_permalink( $t ) . '/#post-' . bbp_get_reply_id( $r[2] );
     126        $reply_url = bbp_get_topic_permalink( $t ) . '#post-' . bbp_get_reply_id( $r[2] );
    127127        $this->assertSame( $reply_url, bbp_get_reply_url( $r[2] ) );
    128128
    … …  
    150150
    151151        // 1st reply is on the first page, 2 replies and 1 topic per first page.
    152         $reply_url = bbp_get_topic_permalink( $t ) . '/#post-' . bbp_get_reply_id( $r[0] );
     152        $reply_url = bbp_get_topic_permalink( $t ) . '#post-' . bbp_get_reply_id( $r[0] );
    153153        $this->assertSame( $reply_url, bbp_get_reply_url( $r[0] ) );
    154154
    155155        // 2nd reply is on the first page, 2 replies and 1 topic per first page.
    156         $reply_url = bbp_get_topic_permalink( $t ) . '/#post-' . bbp_get_reply_id( $r[1] );
     156        $reply_url = bbp_get_topic_permalink( $t ) . '#post-' . bbp_get_reply_id( $r[1] );
    157157        $this->assertSame( $reply_url, bbp_get_reply_url( $r[1] ) );
    158158

  • trunk/tests/phpunit/testcases/topics/template/links.php

    r5947 r6802  
    7272
    7373        $link = bbp_get_topic_freshness_link( $t );
    74         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">3 days, 8 hours ago</a>', $link );
     74        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">3 days, 8 hours ago</a>', $link );
    7575
    7676        $r2 = $this->factory->reply->create( array(
    … …  
    8484
    8585        $link = bbp_get_topic_freshness_link( $t );
    86         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r2 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">2 days, 12 hours ago</a>', $link );
     86        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r2 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">2 days, 12 hours ago</a>', $link );
    8787    }
    8888
    … …  
    127127
    128128        $link = bbp_get_topic_freshness_link( $t );
    129         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">18 hours ago</a>', $link );
     129        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">18 hours ago</a>', $link );
    130130
    131131        $r2 = $this->factory->reply->create( array(
    … …  
    139139
    140140        $link = bbp_get_topic_freshness_link( $t );
    141         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r2 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">16 hours ago</a>', $link );
     141        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r2 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">16 hours ago</a>', $link );
    142142
    143143        bbp_spam_reply( $r2 );
    144144
    145145        $link = bbp_get_topic_freshness_link( $t );
    146         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">18 hours ago</a>', $link );
     146        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">18 hours ago</a>', $link );
    147147
    148148        $r3 = $this->factory->reply->create( array(
    … …  
    156156
    157157        $link = bbp_get_topic_freshness_link( $t );
    158         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r3 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">14 hours ago</a>', $link );
     158        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r3 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">14 hours ago</a>', $link );
    159159
    160160        // Todo: Use bbp_trash_reply() and not wp_trash_post()
    … …  
    162162
    163163        $link = bbp_get_topic_freshness_link( $t );
    164         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">18 hours ago</a>', $link );
     164        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">18 hours ago</a>', $link );
    165165
    166166        $r4 = $this->factory->reply->create( array(
    … …  
    174174
    175175        $link = bbp_get_topic_freshness_link( $t );
    176         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r4 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">12 hours ago</a>', $link );
     176        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r4 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">12 hours ago</a>', $link );
    177177
    178178        bbp_unapprove_reply( $r4 );
    179179
    180180        $link = bbp_get_topic_freshness_link( $t );
    181         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">18 hours ago</a>', $link );
     181        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r1 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">18 hours ago</a>', $link );
    182182
    183183        bbp_unspam_reply( $r2 );
    184184
    185185        $link = bbp_get_topic_freshness_link( $t );
    186         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r2 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">16 hours ago</a>', $link );
     186        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r2 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">16 hours ago</a>', $link );
    187187
    188188        // Todo: Use bbp_untrash_reply() and not wp_untrash_post()
    … …  
    190190
    191191        $link = bbp_get_topic_freshness_link( $t );
    192         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r3 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">14 hours ago</a>', $link );
     192        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r3 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">14 hours ago</a>', $link );
    193193
    194194        bbp_approve_reply( $r4 );
    195195
    196196        $link = bbp_get_topic_freshness_link( $t );
    197         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r4 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">12 hours ago</a>', $link );
     197        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r4 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">12 hours ago</a>', $link );
    198198
    199199        $r5 = $this->factory->reply->create( array(
    … …  
    207207
    208208        $link = bbp_get_topic_freshness_link( $t );
    209         $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1/#post-' . bbp_get_reply_id( $r5 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">10 hours ago</a>', $link );
     209        $this->assertSame( '<a href="http://' . WP_TESTS_DOMAIN . '/?topic=topic-1#post-' . bbp_get_reply_id( $r5 ) . '" title="Reply To: ' . bbp_get_topic_title( $t ) . '">10 hours ago</a>', $link );
    210210    }
    211211
Note: See TracChangeset for help on using the changeset viewer.