Skip to:
Content

bbPress.org

Changeset 5947


Ignore:
Timestamp:
10/27/2015 01:07:53 PM (10 years ago)
Author:
netweb
Message:

Tests: Updated bbPress PHPUnit test suite compatibility with upstream WordPress changes.

  • ​[WP35244] WP_UnitTest_Generator_Sequence needs a static incrementer - otherwise, it assumes every test class is a reset, which it no longer is (it is now static), updated bbPress unit tests where explicitly set content and titles are required.

Props thebrandonallen. Fixes #2883

Location:
trunk/tests/phpunit
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/includes/testcase.php

    r5770 r5947  
    3434            $this->bp_factory = new BP_UnitTest_Factory();
    3535        }
     36
     37        // Our default is ugly permalinks, so reset when needed.
     38        global $wp_rewrite;
     39        if ( $wp_rewrite->permalink_structure ) {
     40            $this->set_permalink_structure();
     41        }
    3642    }
    3743
    … …  
    325331        if ( ! empty( self::$cached_SERVER_NAME ) ) {
    326332            $_SERVER['SERVER_NAME'] = self::$cached_SERVER_NAME;
    327             unset( $this->cached_SERVER_NAME );
     333            self::$cached_SERVER_NAME = '';
    328334        } else {
    329335            unset( $_SERVER['SERVER_NAME'] );
    … …  
    341347        $wpdb->query( 'COMMIT;' );
    342348    }
     349
     350    /**
     351     * Utility method that resets permalinks and flushes rewrites.
     352     *
     353     * @since 2.6.0 bbPress (r5947)
     354     *
     355     * @global WP_Rewrite $wp_rewrite
     356     *
     357     * @uses WP_UnitTestCase::set_permalink_structure()
     358     *
     359     * @param string $structure Optional. Permalink structure to set. Default empty.
     360     */
     361    public function set_permalink_structure( $structure = '' ) {
     362
     363        // Use WP 4.4+'s version if it exists.
     364        if ( method_exists( 'parent', 'set_permalink_structure' ) ) {
     365            parent::set_permalink_structure( $structure );
     366        } else {
     367            global $wp_rewrite;
     368
     369            $wp_rewrite->init();
     370            $wp_rewrite->set_permalink_structure( $structure );
     371            $wp_rewrite->flush_rules();
     372        }
     373    }
    343374}

  • trunk/tests/phpunit/testcases/forums/functions/forum.php

    r5925 r5947  
    1616    public function test_bbp_insert_forum() {
    1717
    18         $f = $this->factory->forum->create();
     18        $f = $this->factory->forum->create( array(
     19            'post_title' => 'Forum 1',
     20            'post_content' => 'Content of Forum 1',
     21        ) );
    1922
    2023        $now = time();

  • trunk/tests/phpunit/testcases/forums/template/feeds.php

    r5914 r5947  
    2020        }
    2121
    22         $f = $this->factory->forum->create();
     22        $f = $this->factory->forum->create( array(
     23            'post_title' => 'Forum 1',
     24        ) );
    2325
    2426        $feed_link = bbp_get_forum_topics_feed_link( $f );
    … …  
    4042        }
    4143
    42         $f = $this->factory->forum->create();
     44        $f = $this->factory->forum->create( array(
     45            'post_title' => 'Forum 1',
     46        ) );
    4347
    4448        $feed_link = bbp_get_forum_replies_feed_link( $f );

  • trunk/tests/phpunit/testcases/forums/template/forum.php

    r5880 r5947  
    4242        }
    4343
    44         $f = $this->factory->forum->create();
     44        $f = $this->factory->forum->create( array(
     45            'post_title' => 'Forum 1',
     46        ) );
    4547
    4648        $forum_permalink = bbp_get_forum_permalink( $f );
    … …  
    5759     */
    5860    public function test_bbp_get_forum_title() {
    59         $f = $this->factory->forum->create();
     61        $f = $this->factory->forum->create( array(
     62            'post_title' => 'Forum 1',
     63        ) );
    6064
    6165        $forum = bbp_get_forum_title( $f );
    … …  
    8185     */
    8286    public function test_bbp_get_forum_content() {
    83         $f = $this->factory->forum->create();
     87        $f = $this->factory->forum->create( array(
     88            'post_content' => 'Content of Forum 1',
     89        ) );
    8490
    8591        $forum = bbp_get_forum_content( $f );
    … …  
    106112
    107113        $t = $this->factory->topic->create( array(
     114            'post_title' => 'Topic 1',
    108115            'post_parent' => $f,
    109116            'post_date' => $post_date,
    … …  
    139146
    140147        $t1 = $this->factory->topic->create( array(
     148            'post_title' => 'Topic 1',
    141149            'post_parent' => $f,
    142150            'post_date' => $post_date_t1,
    … …  
    150158
    151159        $t2 = $this->factory->topic->create( array(
     160            'post_title' => 'Topic 2',
    152161            'post_parent' => $f,
    153162            'post_date' => $post_date_t2,
    … …  
    166175
    167176        $t3 = $this->factory->topic->create( array(
     177            'post_title' => 'Topic 3',
    168178            'post_parent' => $f,
    169179            'post_date' => $post_date_t3,
    … …  
    183193
    184194        $t4 = $this->factory->topic->create( array(
     195            'post_title' => 'Topic 4',
    185196            'post_parent' => $f,
    186197            'post_date' => $post_date_t4,
    … …  
    215226
    216227        $t5 = $this->factory->topic->create( array(
     228            'post_title' => 'Topic 5',
    217229            'post_parent' => $f,
    218230            'post_date' => $post_date_t5,

  • trunk/tests/phpunit/testcases/forums/template/get-last-thing.php

    r5874 r5947  
    187187
    188188        $t = $this->factory->topic->create( array(
     189            'post_title' => 'Topic 1',
    189190            'post_parent' => $f,
    190191            'topic_meta' => array(
    … …  
    340341
    341342        $this->factory->reply->create( array(
     343            'post_title' => 'Reply To: Topic 1',
    342344            'post_parent' => $t,
    343345            'reply_meta' => array(

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

    r5925 r5947  
    2626
    2727        $r = $this->factory->reply->create( array(
     28            'post_title' => 'Reply To: Topic 1',
     29            'post_content' => 'Content of reply to Topic 1',
    2830            'post_parent' => $t,
    2931            'reply_meta' => array(
    … …  
    3638        $reply = bbp_get_reply( $r );
    3739
     40        remove_all_filters( 'bbp_get_reply_content' );
     41
    3842        // Reply post.
    3943        $this->assertSame( 'Reply To: Topic 1', bbp_get_reply_title( $r ) );
     44        $this->assertSame( 'Content of reply to Topic 1', bbp_get_reply_content( $r ) );
    4045        $this->assertSame( 'publish', bbp_get_reply_status( $r ) );
    4146        $this->assertSame( $t, wp_get_post_parent_id( $r ) );

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

    r5896 r5947  
    261261
    262262        $r = $this->factory->reply->create( array(
     263            'post_content' => 'Content of Reply 1',
    263264            'post_parent' => $t,
    264265            'reply_meta' => array(

  • trunk/tests/phpunit/testcases/topics/functions/topic.php

    r5925 r5947  
    2222
    2323        $t = $this->factory->topic->create( array(
     24            'post_title' => 'Topic 1',
     25            'post_content' => 'Content for Topic 1',
    2426            'post_parent' => $f,
    2527            'post_date' => $post_date,
    … …  
    4143        $topic = bbp_get_topic( $t );
    4244
     45        remove_all_filters( 'bbp_get_topic_content' );
     46
    4347        // Topic post.
    4448        $this->assertSame( 'Topic 1', bbp_get_topic_title( $t ) );
     49        $this->assertSame( 'Content for Topic 1', bbp_get_topic_content( $t ) );
    4550        $this->assertSame( 'publish', bbp_get_topic_status( $t ) );
    4651        $this->assertSame( $f, wp_get_post_parent_id( $t ) );

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

    r5914 r5947  
    5151        $f = $this->factory->forum->create();
    5252        $t = $this->factory->topic->create( array(
     53            'post_title' => 'Topic 1',
    5354            'post_parent' => $f,
    5455            'post_date' => $post_date,
    … …  
    105106        $f = $this->factory->forum->create();
    106107        $t = $this->factory->topic->create( array(
     108            'post_title' => 'Topic 1',
    107109            'post_parent' => $f,
    108110            'post_date' => $post_date,

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

    r5879 r5947  
    5858        $f = $this->factory->forum->create();
    5959        $t = $this->factory->topic->create( array(
     60            'post_title' => 'Topic 1',
    6061            'post_parent' => $f,
    6162            'topic_meta' => array(
    … …  
    7980        $f = $this->factory->forum->create();
    8081        $t = $this->factory->topic->create( array(
     82            'post_title' => 'Topic 1',
    8183            'post_parent' => $f,
    8284            'topic_meta' => array(
    … …  
    108110        $f = $this->factory->forum->create();
    109111        $t = $this->factory->topic->create( array(
     112            'post_content' => 'Content of Topic 1',
    110113            'post_parent' => $f,
    111114            'topic_meta' => array(

  • trunk/tests/phpunit/testcases/users/template/user.php

    r5946 r5947  
    2525    }
    2626
    27     private function set_permalink_structure( $permalink_structure = '/%year%/%monthnum%/%day%/%postname%/' ) {
    28         global $wp_rewrite;
    29         $wp_rewrite->set_permalink_structure( $permalink_structure );
    30     }
    31 
    3227    /**
    3328     * @covers ::bbp_user_id
    … …  
    130125
    131126        // Pretty permalinks
    132         $this->set_permalink_structure();
     127        $this->set_permalink_structure( '/%postname%/' );
    133128
    134129        $profile_link      = '<a href="http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/" rel="nofollow">' . $display_name . '</a>';
    … …  
    145140
    146141        // Ugly permalinks
    147         $this->set_permalink_structure( '' );
     142        $this->set_permalink_structure();
    148143
    149144        $profile_link      = '<a href="http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '" rel="nofollow">' . $display_name . '</a>';
    … …  
    180175
    181176        // Pretty permalinks
    182         $this->set_permalink_structure();
     177        $this->set_permalink_structure( '/%postname%/' );
    183178        $profile_url      = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/';
    184179        $user_profile_url = bbp_get_user_profile_url( $this->keymaster_id );
    … …  
    194189
    195190        // Ugly permalinks
    196         $this->set_permalink_structure( '' );
     191        $this->set_permalink_structure();
    197192
    198193        $profile_url      = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id;
    … …  
    215210
    216211        // Pretty permalinks
    217         $this->set_permalink_structure();
     212        $this->set_permalink_structure( '/%postname%/' );
    218213        $profile_edit_link      = '<a href="http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/edit/" rel="nofollow">' . $display_name . '</a>';
    219214        $user_profile_edit_link = bbp_get_user_profile_edit_link( $this->keymaster_id );
    … …  
    229224
    230225        // Ugly permalinks
    231         $this->set_permalink_structure( '' );
     226        $this->set_permalink_structure();
    232227        $profile_edit_link      = '<a href="http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&#038;edit=1" rel="nofollow">' . $display_name . '</a>';
    233228        $user_profile_edit_link = bbp_get_user_profile_edit_link( $this->keymaster_id );
    … …  
    247242
    248243        // Pretty permalinks
    249         $this->set_permalink_structure();
     244        $this->set_permalink_structure( '/%postname%/' );
    250245        $profile_edit_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/edit/';
    251246
    … …  
    257252
    258253        // Ugly permalinks
    259         $this->set_permalink_structure( '' );
     254        $this->set_permalink_structure();
    260255        $profile_edit_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&#038;edit=1';
    261256
    … …  
    271266
    272267        // Pretty permalinks
    273         $this->set_permalink_structure();
     268        $this->set_permalink_structure( '/%postname%/' );
    274269        $profile_edit_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/edit/';
    275270
    … …  
    278273
    279274        // Ugly permalinks
    280         $this->set_permalink_structure( '' );
     275        $this->set_permalink_structure();
    281276        $profile_edit_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&edit=1';
    282277
    … …  
    376371
    377372        // Pretty permalinks
    378         $this->set_permalink_structure();
     373        $this->set_permalink_structure( '/%postname%/' );
    379374        $favorites_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/favorites/';
    380375
    … …  
    386381
    387382        // Ugly permalinks
    388         $this->set_permalink_structure( '' );
     383        $this->set_permalink_structure();
    389384        $favorites_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&#038;bbp_favs=favorites';
    390385
    … …  
    400395
    401396        // Pretty permalinks
    402         $this->set_permalink_structure();
     397        $this->set_permalink_structure( '/%postname%/' );
    403398        $favorites_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/favorites/';
    404399
    … …  
    407402
    408403        // Ugly permalinks
    409         $this->set_permalink_structure( '' );
     404        $this->set_permalink_structure();
    410405        $favorites_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&bbp_favs=favorites';
    411406
    … …  
    432427
    433428        // Pretty permalinks
    434         $this->set_permalink_structure();
     429        $this->set_permalink_structure( '/%postname%/' );
    435430        $subscriptions_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/subscriptions/';
    436431
    … …  
    442437
    443438        // Ugly permalinks
    444         $this->set_permalink_structure( '' );
     439        $this->set_permalink_structure();
    445440        $subscriptions_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&#038;bbp_subs=subscriptions';
    446441
    … …  
    456451
    457452        // Pretty permalinks
    458         $this->set_permalink_structure();
     453        $this->set_permalink_structure( '/%postname%/' );
    459454        $subscriptions_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/subscriptions/';
    460455
    … …  
    463458
    464459        // Ugly permalinks
    465         $this->set_permalink_structure( '' );
     460        $this->set_permalink_structure();
    466461        $subscriptions_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&bbp_subs=subscriptions';
    467462
    … …  
    565560
    566561        // Pretty permalinks
    567         $this->set_permalink_structure();
     562        $this->set_permalink_structure( '/%postname%/' );
    568563        $topics_created_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/topics/';
    569564
    … …  
    575570
    576571        // Ugly permalinks
    577         $this->set_permalink_structure( '' );
     572        $this->set_permalink_structure();
    578573        $topics_created_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&#038;bbp_tops=1';
    579574
    … …  
    589584
    590585        // Pretty permalinks
    591         $this->set_permalink_structure();
     586        $this->set_permalink_structure( '/%postname%/' );
    592587        $topics_created_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/topics/';
    593588
    … …  
    596591
    597592        // Ugly permalinks
    598         $this->set_permalink_structure( '' );
     593        $this->set_permalink_structure();
    599594        $topics_created_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '&bbp_tops=1';
    600595
    … …  
    609604
    610605        // Pretty permalinks
    611         $this->set_permalink_structure();
     606        $this->set_permalink_structure( '/%postname%/' );
    612607        $replies_created_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/replies/';
    613608
    … …  
    619614
    620615        // Ugly permalinks
    621         $this->set_permalink_structure( '' );
     616        $this->set_permalink_structure();
    622617        $replies_created_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user='. $this->keymaster_id . '&#038;bbp_reps=1';
    623618
    … …  
    633628
    634629        // Pretty permalinks
    635         $this->set_permalink_structure();
     630        $this->set_permalink_structure( '/%postname%/' );
    636631        $replies_created_url = 'http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/replies/';
    637632
    … …  
    640635
    641636        // Ugly permalinks
    642         $this->set_permalink_structure( '' );
     637        $this->set_permalink_structure();
    643638        $replies_created_url = 'http://' . WP_TESTS_DOMAIN . '/?bbp_user='. $this->keymaster_id . '&bbp_reps=1';
    644639
    … …  
    715710
    716711        // Pretty permalinks
    717         $this->set_permalink_structure();
     712        $this->set_permalink_structure( '/%postname%/' );
    718713        $author_link = '<a href="http://' . WP_TESTS_DOMAIN . '/forums/user/' . $this->keymaster_userdata->user_nicename . '/" title="View ' . $display_name .
    719714            '&#039;s profile" class="bbp-author-avatar" rel="nofollow">' . $wp_avatar .
    … …  
    731726
    732727        // Ugly permalinks
    733         $this->set_permalink_structure( '' );
     728        $this->set_permalink_structure();
    734729        $author_link = '<a href="http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '" title="View ' . $display_name .
    735730            '&#039;s profile" class="bbp-author-avatar" rel="nofollow">' . $wp_avatar .
Note: See TracChangeset for help on using the changeset viewer.