<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][9988] trunk/tests/phpunit/testcases/core: Break up nav.php automated tests into function-specific test files.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9988">9988</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9988","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-02 19:33:22 +0000 (Thu, 02 Jul 2015)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Break up nav.php automated tests into function-specific test files.

These smaller files improve organization, allow for shorter method names,
and make it easier to gauge test coverage for individual functions.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestcasescorenavphp">trunk/tests/phpunit/testcases/core/nav.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/testcases/core/nav/</li>
<li><a href="#trunktestsphpunittestcasescorenavbpCoreMaybeHookNewSubnavScreenFunctionphp">trunk/tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php</a></li>
<li><a href="#trunktestsphpunittestcasescorenavbpCoreNewNavItemphp">trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php</a></li>
<li><a href="#trunktestsphpunittestcasescorenavbpCoreNewSubnavItemphp">trunk/tests/phpunit/testcases/core/nav/bpCoreNewSubnavItem.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestcasescorenavbpCoreMaybeHookNewSubnavScreenFunctionphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php                         (rev 0)
+++ trunk/tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php   2015-07-02 19:33:22 UTC (rev 9988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,188 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * @group core
+ * @group nav
+ */
+class BP_Tests_Core_Nav_BpCoreMaybeHookNewSubnavScreenFunction extends BP_UnitTestCase {
+
+       public function test_user_has_access_true_no_callable_function() {
+               $subnav_item = array(
+                       'user_has_access' => true,
+                       'screen_function' => '123foo456',
+               );
+
+               $expected = array(
+                       'status' => 'failure',
+               );
+
+               $this->assertSame( $expected, bp_core_maybe_hook_new_subnav_screen_function( $subnav_item ) );
+       }
+
+       public function test_user_has_access_true_callable_function() {
+               $subnav_item = array(
+                       'user_has_access' => true,
+                       'screen_function' => 'wptexturize', // any old callable function
+               );
+
+               $expected = array(
+                       'status' => 'success',
+               );
+
+               $this->assertSame( $expected, bp_core_maybe_hook_new_subnav_screen_function( $subnav_item ) );
+
+               // clean up
+               remove_action( 'bp_screens', 'wptexturize', 3 );
+       }
+
+       public function test_user_has_access_false_user_logged_out() {
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( 0 );
+
+               $subnav_item = array(
+                       'user_has_access' => false,
+               );
+
+               $expected = array(
+                       'status' => 'failure',
+                       'redirect_args' => array(),
+               );
+
+               $this->assertSame( $expected, bp_core_maybe_hook_new_subnav_screen_function( $subnav_item ) );
+
+               $this->set_current_user( $old_current_user );
+       }
+
+       public function test_user_has_access_false_user_logged_in_my_profile() {
+               $u = $this->factory->user->create();
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( $u );
+
+               $this->go_to( bp_core_get_user_domain( $u ) );
+
+               $subnav_item = array(
+                       'user_has_access' => false,
+               );
+
+               // Just test relevant info
+               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
+               $this->assertSame( 'failure', $found['status'] );
+               $this->assertSame( bp_core_get_user_domain( $u ), $found['redirect_args']['root'] );
+
+               $this->set_current_user( $old_current_user );
+       }
+
+       public function test_user_has_access_false_user_logged_in_others_profile_default_component_accessible() {
+               $u1 = $this->factory->user->create();
+               $u2 = $this->factory->user->create();
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( $u1 );
+
+               $this->go_to( bp_core_get_user_domain( $u2 ) );
+
+               $old_bp_nav = buddypress()->bp_nav;
+               $old_default_component = buddypress()->default_component;
+               buddypress()->default_component = 'foo';
+               buddypress()->bp_nav = array(
+                       'foo' => array(
+                               'show_for_displayed_user' => true,
+                       ),
+               );
+
+               $subnav_item = array(
+                       'user_has_access' => false,
+               );
+
+               // Just test relevant info
+               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
+               $this->assertSame( 'failure', $found['status'] );
+               $this->assertSame( bp_core_get_user_domain( $u2 ), $found['redirect_args']['root'] );
+
+               // Clean up
+               $this->set_current_user( $old_current_user );
+               buddypress()->default_component = $old_default_component;
+               buddypress()->bp_nav = $old_bp_nav;
+       }
+
+       public function test_user_has_access_false_user_logged_in_others_profile_default_component_not_accessible() {
+               $u1 = $this->factory->user->create();
+               $u2 = $this->factory->user->create();
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( $u1 );
+
+               $this->go_to( bp_core_get_user_domain( $u2 ) );
+
+               $old_bp_nav = buddypress()->bp_nav;
+               $old_default_component = buddypress()->default_component;
+               buddypress()->default_component = 'foo';
+               buddypress()->bp_nav = array(
+                       'foo' => array(
+                               'show_for_displayed_user' => false,
+                       ),
+               );
+
+               $subnav_item = array(
+                       'user_has_access' => false,
+               );
+
+               // Just test relevant info
+               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
+               $this->assertSame( 'failure', $found['status'] );
+               $this->assertSame( bp_core_get_user_domain( $u2 ) . bp_get_activity_slug() . '/', $found['redirect_args']['root'] );
+
+               // Clean up
+               $this->set_current_user( $old_current_user );
+               buddypress()->default_component = $old_default_component;
+               buddypress()->bp_nav = $old_bp_nav;
+       }
+
+       public function test_user_has_access_false_user_logged_in_group() {
+               $u = $this->factory->user->create();
+               $g = $this->factory->group->create();
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( $u );
+
+               $group = groups_get_group( array(
+                       'group_id' => $g,
+               ) );
+
+               $this->go_to( bp_get_group_permalink( $group ) );
+
+               $subnav_item = array(
+                       'user_has_access' => false,
+                       'no_access_url' => bp_get_group_permalink( $group ),
+               );
+
+               // Just test relevant info
+               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
+               $this->assertSame( 'failure', $found['status'] );
+               $this->assertSame( bp_get_group_permalink( $group ), $found['redirect_args']['root'] );
+
+               // Clean up
+               $this->set_current_user( $old_current_user );
+       }
+
+       public function test_user_has_access_false_user_logged_in_group_no_redirect_url_provided() {
+               $u = $this->factory->user->create();
+               $g = $this->factory->group->create();
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( $u );
+
+               $group = groups_get_group( array(
+                       'group_id' => $g,
+               ) );
+
+               $this->go_to( bp_get_group_permalink( $group ) );
+
+               $subnav_item = array(
+                       'user_has_access' => false,
+               );
+
+               // Just test relevant info
+               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
+               $this->assertSame( 'failure', $found['status'] );
+               $this->assertSame( bp_get_root_domain(), $found['redirect_args']['root'] );
+
+               // Clean up
+               $this->set_current_user( $old_current_user );
+       }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestcasescorenavbpCoreNewNavItemphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php                               (rev 0)
+++ trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php 2015-07-02 19:33:22 UTC (rev 9988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,63 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * @group core
+ * @group nav
+ */
+class BP_Tests_Core_Nav_BpCoreNewNavItem extends BP_UnitTestCase {
+
+       public function test_user_nav() {
+               $bp_nav = buddypress()->bp_nav;
+
+               $u = $this->factory->user->create();
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( $u );
+
+               $this->go_to( bp_core_get_user_domain( $u ) );
+
+               bp_core_new_nav_item( array(
+                       'name'                    => 'Foo',
+                       'slug'                    => 'foo',
+                       'position'                => 25,
+                       'screen_function'         => 'foo_screen_function',
+                       'default_subnav_slug'     => 'foo-sub'
+               ) );
+
+               $expected = array(
+                       'name'                    => 'Foo',
+                       'slug'                    => 'foo',
+                       'link'                    => trailingslashit( bp_core_get_user_domain( $u ) . 'foo' ),
+                       'css_id'                  => 'foo',
+                       'show_for_displayed_user' => true,
+                       'position'                => 25,
+                       'screen_function'         => 'foo_screen_function',
+                       'default_subnav_slug'     => 'foo-sub'
+               );
+
+               $this->assertSame( buddypress()->bp_nav['foo'], $expected );
+
+               // Clean up
+               buddypress()->bp_nav = $bp_nav;
+               $this->set_current_user( $old_current_user );
+       }
+
+       public function test_group_nav() {
+               $bp_nav = buddypress()->bp_nav;
+
+               $u = $this->factory->user->create();
+               $g = $this->factory->group->create();
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( $u );
+
+               $group = groups_get_group( array(
+                       'group_id' => $g,
+               ) );
+
+               $this->go_to( bp_get_group_permalink( $group ) );
+
+               $this->assertTrue( buddypress()->bp_nav[ $group->slug ]['position'] === -1 );
+
+               // Clean up
+               buddypress()->bp_nav = $bp_nav;
+               $this->set_current_user( $old_current_user );
+       }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestcasescorenavbpCoreNewSubnavItemphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/testcases/core/nav/bpCoreNewSubnavItem.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/nav/bpCoreNewSubnavItem.php                            (rev 0)
+++ trunk/tests/phpunit/testcases/core/nav/bpCoreNewSubnavItem.php      2015-07-02 19:33:22 UTC (rev 9988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,215 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * @group core
+ * @group nav
+ */
+class BP_Tests_Core_Nav_BpCoreNewSubnavItem extends BP_UnitTestCase {
+
+       public function test_user_subnav() {
+               $bp_options_nav = buddypress()->bp_options_nav;
+
+               $u = $this->factory->user->create();
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( $u );
+
+               $user_domain = bp_core_get_user_domain( $u );
+
+               $this->go_to( $user_domain );
+
+               bp_core_new_subnav_item( array(
+                       'name'            => 'Foo',
+                       'slug'            => 'foo',
+                       'parent_url'      => trailingslashit( $user_domain . 'foo' ),
+                       'parent_slug'     => 'foo',
+                       'screen_function' => 'foo_screen_function',
+                       'position'        => 10
+               ) );
+
+               $expected = array(
+                       'name'              => 'Foo',
+                       'link'              => trailingslashit( $user_domain . 'foo/foo' ),
+                       'slug'              => 'foo',
+                       'css_id'            => 'foo',
+                       'position'          => 10,
+                       'user_has_access'   => true,
+                       'no_access_url'     => '',
+                       'screen_function'   => 'foo_screen_function',
+                       'show_in_admin_bar' => false,
+               );
+
+               $this->assertSame( buddypress()->bp_options_nav['foo']['foo'], $expected );
+
+               // Clean up
+               buddypress()->bp_options_nav = $bp_options_nav;
+               $this->set_current_user( $old_current_user );
+       }
+
+       public function test_required_params() {
+               // 'name'
+               $this->assertFalse( bp_core_new_subnav_item( array(
+                       'slug' => 'foo',
+                       'parent_slug' => 'foo',
+                       'parent_url' => 'foo',
+                       'screen_function' => 'foo',
+               ) ) );
+
+               // 'slug'
+               $this->assertFalse( bp_core_new_subnav_item( array(
+                       'name' => 'foo',
+                       'parent_slug' => 'foo',
+                       'parent_url' => 'foo',
+                       'screen_function' => 'foo',
+               ) ) );
+
+               // 'parent_slug'
+               $this->assertFalse( bp_core_new_subnav_item( array(
+                       'name' => 'foo',
+                       'slug' => 'foo',
+                       'parent_url' => 'foo',
+                       'screen_function' => 'foo',
+               ) ) );
+
+               // 'parent_url'
+               $this->assertFalse( bp_core_new_subnav_item( array(
+                       'name' => 'foo',
+                       'slug' => 'foo',
+                       'parent_slug' => 'foo',
+                       'screen_function' => 'foo',
+               ) ) );
+
+               // 'screen_function'
+               $this->assertFalse( bp_core_new_subnav_item( array(
+                       'name' => 'foo',
+                       'slug' => 'foo',
+                       'parent_slug' => 'foo',
+                       'parent_url' => 'foo',
+               ) ) );
+       }
+
+       public function test_site_admin_only() {
+               $old_current_user = get_current_user_id();
+               $this->set_current_user( 0 );
+
+               $this->assertFalse( bp_core_new_subnav_item( array(
+                       'name' => 'foo',
+                       'slug' => 'foo',
+                       'parent_slug' => 'foo',
+                       'parent_url' => 'foo',
+                       'screen_function' => 'foo',
+                       'site_admin_only' => true,
+               ) ) );
+
+               $this->set_current_user( $old_current_user );
+       }
+
+       public function test_link_provided() {
+               $bp_options_nav = buddypress()->bp_options_nav;
+
+               bp_core_new_subnav_item( array(
+                       'name' => 'bar',
+                       'slug' => 'bar',
+                       'parent_slug' => 'foo',
+                       'parent_url' => 'foo',
+                       'screen_function' => 'foo',
+                       'link' => 'https://buddypress.org/',
+               ) );
+
+               $this->assertSame( 'https://buddypress.org/', buddypress()->bp_options_nav['foo']['bar']['link'] );
+
+               buddypress()->bp_options_nav = $bp_options_nav;
+       }
+
+       public function test_link_built_from_parent_url_and_slug() {
+               $bp_options_nav = buddypress()->bp_options_nav;
+
+               bp_core_new_subnav_item( array(
+                       'name' => 'bar',
+                       'slug' => 'bar',
+                       'parent_slug' => 'foo',
+                       'parent_url' => 'http://example.com/foo/',
+                       'screen_function' => 'foo',
+               ) );
+
+               $this->assertSame( 'http://example.com/foo/bar/', buddypress()->bp_options_nav['foo']['bar']['link'] );
+
+               buddypress()->bp_options_nav = $bp_options_nav;
+       }
+
+       public function test_link_built_from_parent_url_and_slug_where_slug_is_default() {
+               $bp_nav = buddypress()->bp_nav;
+               $bp_options_nav = buddypress()->bp_options_nav;
+
+               // fake the parent
+               buddypress()->bp_nav = array(
+                       'foo' => array(
+                               'default_subnav_slug' => 'bar',
+                       ),
+               );
+
+               bp_core_new_subnav_item( array(
+                       'name' => 'bar',
+                       'slug' => 'bar',
+                       'parent_slug' => 'foo',
+                       'parent_url' => 'http://example.com/foo/',
+                       'screen_function' => 'foo',
+               ) );
+
+               $this->assertSame( 'http://example.com/foo/', buddypress()->bp_options_nav['foo']['bar']['link'] );
+
+               // clean up
+               buddypress()->bp_nav = $bp_nav;
+               buddypress()->bp_options_nav = $bp_options_nav;
+       }
+
+       public function test_should_trailingslash_link_when_link_is_autogenerated_using_slug() {
+               bp_core_new_subnav_item( array(
+                       'name' => 'bar',
+                       'slug' => 'bar',
+                       'parent_slug' => 'foo',
+                       'parent_url' => bp_get_root_domain() . 'foo/',
+                       'screen_function' => 'foo',
+               ) );
+
+               $expected = bp_get_root_domain() . 'foo/bar/';
+               $this->assertSame( $expected, buddypress()->bp_options_nav['foo']['bar']['link'] );
+       }
+
+       public function test_should_trailingslash_link_when_link_is_autogenerated_not_using_slug() {
+               bp_core_new_nav_item( array(
+                       'name' => 'foo',
+                       'slug' => 'foo-parent',
+                       'link' => bp_get_root_domain() . 'foo-parent/',
+                       'default_subnav_slug' => 'bar',
+                       'screen_function' => 'foo',
+               ) );
+
+               bp_core_new_subnav_item( array(
+                       'name' => 'bar',
+                       'slug' => 'bar',
+                       'parent_slug' => 'foo-parent',
+                       'parent_url' => bp_get_root_domain() . 'foo-parent/',
+                       'screen_function' => 'bar',
+               ) );
+
+               $expected = bp_get_root_domain() . 'foo-parent/';
+               $this->assertSame( $expected, buddypress()->bp_options_nav['foo-parent']['bar']['link'] );
+       }
+
+       /**
+        * @ticket BP6353
+        */
+       public function test_link_should_not_trailingslash_link_explicit_link() {
+               $link = 'http://example.com/foo/bar/blah/?action=edit&id=30';
+
+               bp_core_new_subnav_item( array(
+                       'name' => 'bar',
+                       'slug' => 'bar',
+                       'parent_slug' => 'foo',
+                       'parent_url' => 'http://example.com/foo/',
+                       'screen_function' => 'foo',
+                       'link' => $link,
+               ) );
+
+               $this->assertSame( $link, buddypress()->bp_options_nav['foo']['bar']['link'] );
+       }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestcasescorenavphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/nav.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/nav.php        2015-07-02 19:08:07 UTC (rev 9987)
+++ trunk/tests/phpunit/testcases/core/nav.php  2015-07-02 19:33:22 UTC (rev 9988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,68 +7,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class BP_Tests_Core_Nav extends BP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @group bp_core_new_nav_item
-        */
-       public function test_bp_core_new_nav_item_user_nav() {
-               $bp_nav = buddypress()->bp_nav;
-
-               $u = $this->factory->user->create();
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( $u );
-
-               $this->go_to( bp_core_get_user_domain( $u ) );
-
-               bp_core_new_nav_item( array(
-                       'name'                    => 'Foo',
-                       'slug'                    => 'foo',
-                       'position'                => 25,
-                       'screen_function'         => 'foo_screen_function',
-                       'default_subnav_slug'     => 'foo-sub'
-               ) );
-
-               $expected = array(
-                       'name'                    => 'Foo',
-                       'slug'                    => 'foo',
-                       'link'                    => trailingslashit( bp_core_get_user_domain( $u ) . 'foo' ),
-                       'css_id'                  => 'foo',
-                       'show_for_displayed_user' => true,
-                       'position'                => 25,
-                       'screen_function'         => 'foo_screen_function',
-                       'default_subnav_slug'     => 'foo-sub'
-               );
-
-               $this->assertSame( buddypress()->bp_nav['foo'], $expected );
-
-               // Clean up
-               buddypress()->bp_nav = $bp_nav;
-               $this->set_current_user( $old_current_user );
-       }
-
-       /**
-        * @group bp_core_new_nav_item
-        */
-       public function test_bp_core_new_nav_item_group_nav() {
-               $bp_nav = buddypress()->bp_nav;
-
-               $u = $this->factory->user->create();
-               $g = $this->factory->group->create();
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( $u );
-
-               $group = groups_get_group( array(
-                       'group_id' => $g,
-               ) );
-
-               $this->go_to( bp_get_group_permalink( $group ) );
-
-               $this->assertTrue( buddypress()->bp_nav[ $group->slug ]['position'] === -1 );
-
-               // Clean up
-               buddypress()->bp_nav = $bp_nav;
-               $this->set_current_user( $old_current_user );
-       }
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * @group bp_core_sort_nav_items
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function test_bp_core_sort_nav_items() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,444 +47,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @group bp_core_new_subnav_item
-        */
-       public function test_bp_core_new_subnav_item_user_subnav() {
-               $bp_options_nav = buddypress()->bp_options_nav;
-
-               $u = $this->factory->user->create();
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( $u );
-
-               $user_domain = bp_core_get_user_domain( $u );
-
-               $this->go_to( $user_domain );
-
-               bp_core_new_subnav_item( array(
-                       'name'            => 'Foo',
-                       'slug'            => 'foo',
-                       'parent_url'      => trailingslashit( $user_domain . 'foo' ),
-                       'parent_slug'     => 'foo',
-                       'screen_function' => 'foo_screen_function',
-                       'position'        => 10
-               ) );
-
-               $expected = array(
-                       'name'              => 'Foo',
-                       'link'              => trailingslashit( $user_domain . 'foo/foo' ),
-                       'slug'              => 'foo',
-                       'css_id'            => 'foo',
-                       'position'          => 10,
-                       'user_has_access'   => true,
-                       'no_access_url'     => '',
-                       'screen_function'   => 'foo_screen_function',
-                       'show_in_admin_bar' => false,
-               );
-
-               $this->assertSame( buddypress()->bp_options_nav['foo']['foo'], $expected );
-
-               // Clean up
-               buddypress()->bp_options_nav = $bp_options_nav;
-               $this->set_current_user( $old_current_user );
-       }
-
-       /**
-        * @group bp_core_new_subnav_item
-        */
-       public function test_bp_core_new_subnav_item_required_params() {
-               // 'name'
-               $this->assertFalse( bp_core_new_subnav_item( array(
-                       'slug' => 'foo',
-                       'parent_slug' => 'foo',
-                       'parent_url' => 'foo',
-                       'screen_function' => 'foo',
-               ) ) );
-
-               // 'slug'
-               $this->assertFalse( bp_core_new_subnav_item( array(
-                       'name' => 'foo',
-                       'parent_slug' => 'foo',
-                       'parent_url' => 'foo',
-                       'screen_function' => 'foo',
-               ) ) );
-
-               // 'parent_slug'
-               $this->assertFalse( bp_core_new_subnav_item( array(
-                       'name' => 'foo',
-                       'slug' => 'foo',
-                       'parent_url' => 'foo',
-                       'screen_function' => 'foo',
-               ) ) );
-
-               // 'parent_url'
-               $this->assertFalse( bp_core_new_subnav_item( array(
-                       'name' => 'foo',
-                       'slug' => 'foo',
-                       'parent_slug' => 'foo',
-                       'screen_function' => 'foo',
-               ) ) );
-
-               // 'screen_function'
-               $this->assertFalse( bp_core_new_subnav_item( array(
-                       'name' => 'foo',
-                       'slug' => 'foo',
-                       'parent_slug' => 'foo',
-                       'parent_url' => 'foo',
-               ) ) );
-       }
-
-       /**
-        * @group bp_core_new_subnav_item
-        */
-       public function test_bp_core_new_subnav_item_site_admin_only() {
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( 0 );
-
-               $this->assertFalse( bp_core_new_subnav_item( array(
-                       'name' => 'foo',
-                       'slug' => 'foo',
-                       'parent_slug' => 'foo',
-                       'parent_url' => 'foo',
-                       'screen_function' => 'foo',
-                       'site_admin_only' => true,
-               ) ) );
-
-               $this->set_current_user( $old_current_user );
-       }
-
-       /**
-        * @group bp_core_new_subnav_item
-        */
-       public function test_bp_core_new_subnav_item_link_provided() {
-               $bp_options_nav = buddypress()->bp_options_nav;
-
-               bp_core_new_subnav_item( array(
-                       'name' => 'bar',
-                       'slug' => 'bar',
-                       'parent_slug' => 'foo',
-                       'parent_url' => 'foo',
-                       'screen_function' => 'foo',
-                       'link' => 'https://buddypress.org/',
-               ) );
-
-               $this->assertSame( 'https://buddypress.org/', buddypress()->bp_options_nav['foo']['bar']['link'] );
-
-               buddypress()->bp_options_nav = $bp_options_nav;
-       }
-
-       /**
-        * @group bp_core_new_subnav_item
-        */
-       public function test_bp_core_new_subnav_item_link_built_from_parent_url_and_slug() {
-               $bp_options_nav = buddypress()->bp_options_nav;
-
-               bp_core_new_subnav_item( array(
-                       'name' => 'bar',
-                       'slug' => 'bar',
-                       'parent_slug' => 'foo',
-                       'parent_url' => 'http://example.com/foo/',
-                       'screen_function' => 'foo',
-               ) );
-
-               $this->assertSame( 'http://example.com/foo/bar/', buddypress()->bp_options_nav['foo']['bar']['link'] );
-
-               buddypress()->bp_options_nav = $bp_options_nav;
-       }
-
-       /**
-        * @group bp_core_new_subnav_item
-        */
-       public function test_bp_core_new_subnav_item_link_built_from_parent_url_and_slug_where_slug_is_default() {
-               $bp_nav = buddypress()->bp_nav;
-               $bp_options_nav = buddypress()->bp_options_nav;
-
-               // fake the parent
-               buddypress()->bp_nav = array(
-                       'foo' => array(
-                               'default_subnav_slug' => 'bar',
-                       ),
-               );
-
-               bp_core_new_subnav_item( array(
-                       'name' => 'bar',
-                       'slug' => 'bar',
-                       'parent_slug' => 'foo',
-                       'parent_url' => 'http://example.com/foo/',
-                       'screen_function' => 'foo',
-               ) );
-
-               $this->assertSame( 'http://example.com/foo/', buddypress()->bp_options_nav['foo']['bar']['link'] );
-
-               // clean up
-               buddypress()->bp_nav = $bp_nav;
-               buddypress()->bp_options_nav = $bp_options_nav;
-       }
-
-       /**
-        * @group bp_core_maybe_hook_new_subnav_screen_function
-        */
-       public function test_maybe_hook_new_subnav_screen_function_user_has_access_true_no_callable_function() {
-               $subnav_item = array(
-                       'user_has_access' => true,
-                       'screen_function' => '123foo456',
-               );
-
-               $expected = array(
-                       'status' => 'failure',
-               );
-
-               $this->assertSame( $expected, bp_core_maybe_hook_new_subnav_screen_function( $subnav_item ) );
-       }
-
-       /**
-        * @group bp_core_maybe_hook_new_subnav_screen_function
-        */
-       public function test_maybe_hook_new_subnav_screen_function_user_has_access_true_callable_function() {
-               $subnav_item = array(
-                       'user_has_access' => true,
-                       'screen_function' => 'wptexturize', // any old callable function
-               );
-
-               $expected = array(
-                       'status' => 'success',
-               );
-
-               $this->assertSame( $expected, bp_core_maybe_hook_new_subnav_screen_function( $subnav_item ) );
-
-               // clean up
-               remove_action( 'bp_screens', 'wptexturize', 3 );
-       }
-
-       /**
-        * @group bp_core_maybe_hook_new_subnav_screen_function
-        */
-       public function test_maybe_hook_new_subnav_screen_function_user_has_access_false_user_logged_out() {
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( 0 );
-
-               $subnav_item = array(
-                       'user_has_access' => false,
-               );
-
-               $expected = array(
-                       'status' => 'failure',
-                       'redirect_args' => array(),
-               );
-
-               $this->assertSame( $expected, bp_core_maybe_hook_new_subnav_screen_function( $subnav_item ) );
-
-               $this->set_current_user( $old_current_user );
-       }
-
-       /**
-        * @group bp_core_maybe_hook_new_subnav_screen_function
-        */
-       public function test_maybe_hook_new_subnav_screen_function_user_has_access_false_user_logged_in_my_profile() {
-               $u = $this->factory->user->create();
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( $u );
-
-               $this->go_to( bp_core_get_user_domain( $u ) );
-
-               $subnav_item = array(
-                       'user_has_access' => false,
-               );
-
-               // Just test relevant info
-               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
-               $this->assertSame( 'failure', $found['status'] );
-               $this->assertSame( bp_core_get_user_domain( $u ), $found['redirect_args']['root'] );
-
-               $this->set_current_user( $old_current_user );
-       }
-
-       /**
-        * @group bp_core_maybe_hook_new_subnav_screen_function
-        */
-       public function test_maybe_hook_new_subnav_screen_function_user_has_access_false_user_logged_in_others_profile_default_component_accessible() {
-               $u1 = $this->factory->user->create();
-               $u2 = $this->factory->user->create();
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( $u1 );
-
-               $this->go_to( bp_core_get_user_domain( $u2 ) );
-
-               $old_bp_nav = buddypress()->bp_nav;
-               $old_default_component = buddypress()->default_component;
-               buddypress()->default_component = 'foo';
-               buddypress()->bp_nav = array(
-                       'foo' => array(
-                               'show_for_displayed_user' => true,
-                       ),
-               );
-
-               $subnav_item = array(
-                       'user_has_access' => false,
-               );
-
-               // Just test relevant info
-               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
-               $this->assertSame( 'failure', $found['status'] );
-               $this->assertSame( bp_core_get_user_domain( $u2 ), $found['redirect_args']['root'] );
-
-               // Clean up
-               $this->set_current_user( $old_current_user );
-               buddypress()->default_component = $old_default_component;
-               buddypress()->bp_nav = $old_bp_nav;
-       }
-
-       /**
-        * @group bp_core_maybe_hook_new_subnav_screen_function
-        */
-       public function test_maybe_hook_new_subnav_screen_function_user_has_access_false_user_logged_in_others_profile_default_component_not_accessible() {
-               $u1 = $this->factory->user->create();
-               $u2 = $this->factory->user->create();
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( $u1 );
-
-               $this->go_to( bp_core_get_user_domain( $u2 ) );
-
-               $old_bp_nav = buddypress()->bp_nav;
-               $old_default_component = buddypress()->default_component;
-               buddypress()->default_component = 'foo';
-               buddypress()->bp_nav = array(
-                       'foo' => array(
-                               'show_for_displayed_user' => false,
-                       ),
-               );
-
-               $subnav_item = array(
-                       'user_has_access' => false,
-               );
-
-               // Just test relevant info
-               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
-               $this->assertSame( 'failure', $found['status'] );
-               $this->assertSame( bp_core_get_user_domain( $u2 ) . bp_get_activity_slug() . '/', $found['redirect_args']['root'] );
-
-               // Clean up
-               $this->set_current_user( $old_current_user );
-               buddypress()->default_component = $old_default_component;
-               buddypress()->bp_nav = $old_bp_nav;
-       }
-
-       /**
-        * @group bp_core_maybe_hook_new_subnav_screen_function
-        */
-       public function test_maybe_hook_new_subnav_screen_function_user_has_access_false_user_logged_in_group() {
-               $u = $this->factory->user->create();
-               $g = $this->factory->group->create();
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( $u );
-
-               $group = groups_get_group( array(
-                       'group_id' => $g,
-               ) );
-
-               $this->go_to( bp_get_group_permalink( $group ) );
-
-               $subnav_item = array(
-                       'user_has_access' => false,
-                       'no_access_url' => bp_get_group_permalink( $group ),
-               );
-
-               // Just test relevant info
-               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
-               $this->assertSame( 'failure', $found['status'] );
-               $this->assertSame( bp_get_group_permalink( $group ), $found['redirect_args']['root'] );
-
-               // Clean up
-               $this->set_current_user( $old_current_user );
-       }
-
-       /**
-        * @group bp_core_maybe_hook_new_subnav_screen_function
-        */
-       public function test_maybe_hook_new_subnav_screen_function_user_has_access_false_user_logged_in_group_no_redirect_url_provided() {
-               $u = $this->factory->user->create();
-               $g = $this->factory->group->create();
-               $old_current_user = get_current_user_id();
-               $this->set_current_user( $u );
-
-               $group = groups_get_group( array(
-                       'group_id' => $g,
-               ) );
-
-               $this->go_to( bp_get_group_permalink( $group ) );
-
-               $subnav_item = array(
-                       'user_has_access' => false,
-               );
-
-               // Just test relevant info
-               $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
-               $this->assertSame( 'failure', $found['status'] );
-               $this->assertSame( bp_get_root_domain(), $found['redirect_args']['root'] );
-
-               // Clean up
-               $this->set_current_user( $old_current_user );
-       }
-
-       /**
-        * @group bp_core_new_subnav_item()
-        */
-       public function test_bp_core_new_subnav_item_should_trailingslash_link_when_link_is_autogenerated_using_slug() {
-               bp_core_new_subnav_item( array(
-                       'name' => 'bar',
-                       'slug' => 'bar',
-                       'parent_slug' => 'foo',
-                       'parent_url' => bp_get_root_domain() . 'foo/',
-                       'screen_function' => 'foo',
-               ) );
-
-               $expected = bp_get_root_domain() . 'foo/bar/';
-               $this->assertSame( $expected, buddypress()->bp_options_nav['foo']['bar']['link'] );
-       }
-
-       /**
-        * @group bp_core_new_subnav_item()
-        */
-       public function test_bp_core_new_subnav_item_should_trailingslash_link_when_link_is_autogenerated_not_using_slug() {
-               bp_core_new_nav_item( array(
-                       'name' => 'foo',
-                       'slug' => 'foo-parent',
-                       'link' => bp_get_root_domain() . 'foo-parent/',
-                       'default_subnav_slug' => 'bar',
-                       'screen_function' => 'foo',
-               ) );
-
-               bp_core_new_subnav_item( array(
-                       'name' => 'bar',
-                       'slug' => 'bar',
-                       'parent_slug' => 'foo-parent',
-                       'parent_url' => bp_get_root_domain() . 'foo-parent/',
-                       'screen_function' => 'bar',
-               ) );
-
-               $expected = bp_get_root_domain() . 'foo-parent/';
-               $this->assertSame( $expected, buddypress()->bp_options_nav['foo-parent']['bar']['link'] );
-       }
-
-       /**
-        * @group bp_core_new_subnav_item
-        * @ticket BP6353
-        */
-       public function test_bp_core_new_subnav_item_link_should_not_trailingslash_link_explicit_link() {
-               $link = 'http://example.com/foo/bar/blah/?action=edit&id=30';
-
-               bp_core_new_subnav_item( array(
-                       'name' => 'bar',
-                       'slug' => 'bar',
-                       'parent_slug' => 'foo',
-                       'parent_url' => 'http://example.com/foo/',
-                       'screen_function' => 'foo',
-                       'link' => $link,
-               ) );
-
-               $this->assertSame( $link, buddypress()->bp_options_nav['foo']['bar']['link'] );
-       }
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * @group bp_core_sort_subnav_items
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function test_bp_core_sort_subnav_items() {
</span></span></pre>
</div>
</div>

</body>
</html>