Changeset 10194 for trunk/tests/phpunit/testcases/core/class-bp-attachment.php

Timestamp:

10/06/2015 11:53:33 PM (9 years ago)

Author:

imath

Message:

Allow class extending the BP_Attachment class to get the original WordPress upload dir within their upload_dir_filter() method.

To do so, you simply need to add the argument $upload_dir_filter_args to the array you use inside your constructor and set it to 1.

Props rittesh.patel

Fixes #6591

File:

• trunk/tests/phpunit/testcases/core/class-bp-attachment.php (modified) (3 diffs)

trunk/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( 'upload_dir',                     array( $this, 'filter_upload_dir' ), 20, 1 );
+        add_filter( 'bp_attachment_upload_overrides',        array( $this, 'filter_overrides' ),       10, 1 );
+        add_filter( 'upload_dir',                            array( $this, 'filter_upload_dir' ),      20, 1 );
+        add_filter( 'bp_attachments_cover_image_upload_dir', array( $this, 'filter_cover_image_dir' ), 10, 2 );
         $this->upload_results = array();
         $this->image_file = trailingslashit( buddypress()->plugin_dir ) . 'bp-core/images/mystery-man.jpg';
+        $this->original_upload_dir = array();
     }
 
     public function tearDown() {
         parent::tearDown();
-        remove_filter( 'bp_attachment_upload_overrides', array( $this, 'filter_overrides' ),  10, 1 );
-        remove_filter( 'upload_dir',                     array( $this, 'filter_upload_dir' ), 20, 1 );
+        remove_filter( 'bp_attachment_upload_overrides',     array( $this, 'filter_overrides' ),       10, 1 );
+        remove_filter( 'upload_dir',                         array( $this, 'filter_upload_dir' ),      20, 1 );
+        add_filter( 'bp_attachments_cover_image_upload_dir', array( $this, 'filter_cover_image_dir' ), 10, 2 );
         $this->upload_results = array();
         $this->image_file = '';
+        $this->original_upload_dir = array();
     }
 
@@ -44 +48 @@
 
         return $upload_dir;
+    }
+
+    public function filter_cover_image_dir( $cover_dir, $upload_dir ) {
+        $this->original_upload_dir = $upload_dir;
+
+        return $cover_dir;
     }
 
@@ -454 +464 @@
         $this->assertTrue( 3 === $image_data['meta']['orientation'] );
     }
+
+    /**
+     * @group upload
+     * @group cover_images
+     */
+    public function test_bp_attachment_upload_dir_filter_arg() {
+        $reset_files = $_FILES;
+        $reset_post = $_POST;
+
+        $attachment_class = new BPTest_Attachment_Extension( array(
+            'action'                 => 'attachment_action',
+            'file_input'             => 'attachment_file_input',
+            'base_dir'               => 'attachment_base_dir',
+            'upload_dir_filter_args' => 1,
+        ) );
+
+        $_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 ),
+        );
+
+        // Simulate an upload
+        $attachment_class->upload( $_FILES );
+
+        // Remove the filter used to fake uploads
+        remove_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
+
+        $this->assertSame( $attachment_class->original_upload_dir, wp_upload_dir() );
+
+        // Restore the filter used to fake uploads
+        add_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
+
+        $this->assertTrue( 1 === $attachment_class->upload_dir_filter_args );
+
+        $cover_image_class = new BP_Attachment_Cover_Image();
+
+        // Simulate an upload
+        $cover_image_class->upload( $_FILES );
+
+        // Should be empty
+        $this->assertEmpty( $this->original_upload_dir );
+
+        $this->assertTrue( 0 === $cover_image_class->upload_dir_filter_args );
+
+        $_FILES = $reset_files;
+        $_POST = $reset_post;
+    }
 }