Changeset 8966 for trunk/tests/phpunit/testcases/members/class-bp-signup.php

Timestamp:

08/26/2014 11:20:57 PM (10 years ago)

Author:

imath

Message:

Edit the unit test test_activate_user_accounts_with_blogs()

Make sure the test is working while running all tests and only BP_Signup tests

Fixes #5834

File:

• trunk/tests/phpunit/testcases/members/class-bp-signup.php (modified) (4 diffs)

trunk/tests/phpunit/testcases/members/class-bp-signup.php

@@ -252 +252 @@
      */
     public function test_activate_user_accounts_with_blogs() {
-        global $wpdb, $current_site;
+        global $wpdb, $current_site, $base;
 
         if ( ! is_multisite() ) {
@@ -260 +260 @@
         $signups = array();
 
-        $signups['blogone'] = $this->factory->signup->create( array(
-            'user_login'     => 'blogone',
+        // Can't trust this first signup :(
+        $signups['testpath1'] = $this->factory->signup->create( array(
+            'user_login'     => 'testpath1',
             'user_email'     => 'blogone@example.com',
-            'domain'         => $current_site->domain,
-            'path'           => '/blogone/',
-            'title'          => 'Blog One',
+            'domain'         => '',
+            'path'           => '',
+            'title'          => '',
             'activation_key' => 'activationkeyblogone',
         ) );
@@ -272 +273 @@
             'user_login'     => 'blogtwo',
             'user_email'     => 'blogtwo@example.com',
+            'domain'         => $current_site->domain,
+            'path'           => $base . 'blogtwo',
+            'title'          => 'Blog Two',
+            'activation_key' => 'activationkeyblogtwo',
+        ) );
+
+        $signups['blogthree'] = $this->factory->signup->create( array(
+            'user_login'     => 'blogthree',
+            'user_email'     => 'blogthree@example.com',
             'domain'         => '',
             'path'           => '',
             'title'          => '',
-            'activation_key' => 'activationkeyblogtwo',
-        ) );
-
-        $signups['blogthree'] = $this->factory->signup->create( array(
-            'user_login'     => 'blogthree',
-            'user_email'     => 'blogthree@example.com',
+            'activation_key' => 'activationkeyblogthree',
+        ) );
+
+        $signups['blogfour'] = $this->factory->signup->create( array(
+            'user_login'     => 'blogfour',
+            'user_email'     => 'blogfour@example.com',
             'domain'         => $current_site->domain,
-            'path'           => '/blogthree/',
-            'title'          => 'Blog Three',
-            'activation_key' => 'activationkeyblogthree',
+            'path'           => $base . 'blogfour',
+            'title'          => 'Blog Four',
+            'activation_key' => 'activationkeyblogfour',
         ) );
 
@@ -307 +317 @@
 
         foreach ( $users as $path => $user  ) {
+            // Can't trust this first signup :(
+            if ( 'testpath1' == $path ) {
+                continue;
+            }
+
             $blogs[ $path ] = get_active_blog_for_user( $user->ID );
         }