Ticket #6438: 6438-unittest.patch

tests/phpunit/testcases/core/class-bp-attachment.php

@@ -13 +13 @@
         public function setUp() {
                 parent::setUp();
                 add_filter( 'bp_attachment_upload_overrides', array( $this, 'filter_overrides' ),  10, 1 );
-                add_filter( 'bp_attachment_upload_dir',       array( $this, 'filter_upload_dir' ), 10, 1 );
-                add_filter( 'xprofile_avatar_upload_dir',     array( $this, 'filter_upload_dir' ), 10, 1 );
-                add_filter( 'groups_avatar_upload_dir',       array( $this, 'filter_upload_dir' ), 10, 1 );
+                add_filter( 'upload_dir',                     array( $this, 'filter_upload_dir' ), 20, 1 );
                 $this->upload_results = array();
                 $this->image_file = trailingslashit( buddypress()->plugin_dir ) . 'bp-core/images/mystery-man.jpg';
         }
@@ -23 +21 @@
         public function tearDown() {
                 parent::tearDown();
                 remove_filter( 'bp_attachment_upload_overrides', array( $this, 'filter_overrides' ),  10, 1 );
-                remove_filter( 'bp_attachment_upload_dir',       array( $this, 'filter_upload_dir' ), 10, 1 );
-                remove_filter( 'xprofile_avatar_upload_dir',     array( $this, 'filter_upload_dir' ), 10, 1 );
-                remove_filter( 'groups_avatar_upload_dir',       array( $this, 'filter_upload_dir' ), 10, 1 );
+                remove_filter( 'upload_dir',                     array( $this, 'filter_upload_dir' ), 20, 1 );
                 $this->upload_results = array();
                 $this->image_file = '';
         }
@@ -175 +171 @@
 
         /**
          * @group upload
+         */
+        public function test_bp_attachment_upload_no_base_dir_specific_time() {
+                $reset_files = $_FILES;
+                $reset_post = $_POST;
+
+                $attachment_class = new BPTest_Attachment_Extension( array(
+                        'action'                => 'attachment_action',
+                        'file_input'            => 'attachment_file_input',
+                ) );
+
+                $_POST['action'] = $attachment_class->action;
+                $_FILES[ $attachment_class->file_input ] = array(
+                        'tmp_name' => $this->image_file,
+                        'name'     => 'mystery-man.jpg',
+                        'type'     => 'image/jpeg',
+                        'error'    => 0,
+                        'size'     => filesize( $this->image_file ),
+                );
+
+                $time = '2015/01';
+
+                // Error: file size
+                $upload = $attachment_class->upload( $_FILES, '', $time );
+
+                $this->assertEquals( $upload['file'], $attachment_class->upload_path . '/' . $time . '/mystery-man.jpg' );
+
+                // clean up!
+                $_FILES = $reset_files;
+                $_POST = $reset_post;
+        }
+
+        /**
+         * @group upload
          * @group avatar
          */
         public function test_bp_attachment_avatar_user_upload() {