[a-fA-F0-9]{13})', $routes );
+
+ foreach ( $this->api::$endpoints as $route ) {
+ $this->assertArrayHasKey( '/' . $this->api::NAMESPACE . $route, $routes );
+ }
}
public function test_context_param() {
@@ -90,7 +47,12 @@ public function test_context_param() {
$data = $response->get_data();
$this->assertSame( 'edit', $data['endpoints'][0]['args']['context']['default'] );
- $this->assertSame( [ 'edit' ], $data['endpoints'][0]['args']['context']['enum'] );
+
+ $contexts = [ 'advanced', 'appearance', 'edit', 'general', 'template' ];
+
+ $enum = $data['endpoints'][0]['args']['context']['enum'];
+ sort( $enum );
+ $this->assertSame( $contexts, $enum );
/* Single */
$pdf_id = $this->factory->pdf->create();
@@ -99,12 +61,15 @@ public function test_context_param() {
$data = $response->get_data();
$this->assertSame( 'edit', $data['endpoints'][0]['args']['context']['default'] );
- $this->assertSame( [ 'edit' ], $data['endpoints'][0]['args']['context']['enum'] );
+
+ $enum = $data['endpoints'][0]['args']['context']['enum'];
+ sort( $enum );
+ $this->assertSame( $contexts, $enum );
}
public function test_get_items() {
$this->factory->pdf->create_many( 5, [
- 'template' => 'zadani',
+ 'template' => 'rubix',
] );
wp_set_current_user( self::$admin_id );
@@ -117,6 +82,63 @@ public function test_get_items() {
$this->test_for_pdf_settings( $data[0] );
}
+ public function test_get_items_for_entry() {
+ $this->factory->pdf->create_many( 2, [
+ 'template' => 'rubix',
+ ] );
+
+ $this->factory->pdf->create( [ 'active' => false ] );
+ $this->factory->pdf->create( [
+ 'conditional' => 1,
+ 'conditionalLogic' => [
+ 'actionType' => 'show',
+ 'logicType' => 'all',
+ 'rules' => [
+ [
+ 'fieldId' => 1,
+ 'operator' => 'is',
+ 'value' => 'something',
+ ],
+ ],
+ ],
+ ] );
+
+ /* Test we get all PDFs back */
+ wp_set_current_user( self::$admin_id );
+ $request = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id );
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertSame( 200, $response->get_status() );
+ $this->assertCount( 4, $data );
+
+ /* Test we only get 2 PDFs back */
+ $entry_id = $this->factory->entry->create( [ 'form_id' => $this->form_id ] );
+ $request->set_query_params( [
+ 'entry' => $entry_id,
+ ] );
+
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertSame( 200, $response->get_status() );
+ $this->assertCount( 2, $data );
+
+ $this->assertArrayHasKey( 'entry', $data[0]['_links'] );
+
+ /* Test we get 3 PDFs back */
+ $entry_id = $this->factory->entry->create( [ 'form_id' => $this->form_id, '1' => 'something' ] );
+ $request->set_query_params( [
+ 'entry' => $entry_id,
+ ] );
+
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertSame( 200, $response->get_status() );
+ $this->assertCount( 3, $data );
+ }
+
/**
* @param $args
*
@@ -145,7 +167,7 @@ protected function test_for_pdf_settings( $args ): void {
$this->assertArrayHasKey( 'pdf_size', $args );
$this->assertArrayHasKey( 'custom_pdf_size', $args );
$this->assertArrayHasKey( 'orientation', $args );
- $this->assertArrayHasKey( 'zadani_border_colour', $args );
+ $this->assertArrayHasKey( 'rubix_container_background_colour', $args );
$this->assertArrayHasKey( 'show_form_title', $args );
$this->assertArrayHasKey( 'show_page_names', $args );
$this->assertArrayHasKey( 'show_html', $args );
@@ -160,6 +182,51 @@ protected function test_for_pdf_settings( $args ): void {
$this->assertArrayHasKey( 'first_footer', $args );
}
+ public function test_get_items_with_filters() {
+ $this->factory->pdf->create( [ 'template' => 'rubix' ] );
+ $this->factory->pdf->create( [ 'template' => 'focus-gravity' ] );
+ $this->factory->pdf->create( [ 'template' => 'zadani' ] );
+ $this->factory->pdf->create( [ 'template' => 'blank-slate' ] );
+
+ wp_set_current_user( self::$admin_id );
+ $request = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id );
+
+ /* Filter by context */
+ $request->set_query_params( [ 'context' => 'template' ] );
+
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertCount( 4, $data );
+
+ $this->assertArrayNotHasKey( 'name', $data[0] );
+ $this->assertArrayHasKey( 'rubix_container_background_colour', $data[0] );
+
+ $this->assertArrayNotHasKey( 'name', $data[1] );
+ $this->assertArrayHasKey( 'focusgravity_accent_colour', $data[1] );
+
+ $this->assertArrayNotHasKey( 'name', $data[2] );
+ $this->assertArrayHasKey( 'zadani_border_colour', $data[2] );
+
+ $this->assertArrayNotHasKey( 'name', $data[3] );
+ $this->assertArrayHasKey( 'header', $data[3] );
+
+ /* Filter using special _filter query param */
+ $request->set_query_params( [ '_fields' => 'name,filename,template' ] );
+
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertCount( 4, $data );
+ $this->assertCount( 4, $data[0] );
+ $this->assertCount( 4, $data[1] );
+
+ $this->assertArrayHasKey( 'id', $data[0] );
+ $this->assertArrayHasKey( 'name', $data[0] );
+ $this->assertArrayHasKey( 'filename', $data[0] );
+ $this->assertArrayHasKey( 'template', $data[0] );
+ }
+
public function test_get_items_invalid_permission() {
wp_set_current_user( 0 );
@@ -180,40 +247,40 @@ public function test_get_items_invalid_permission() {
public function test_get_item() {
$template_pdf_config = [
- 'name' => 'My First PDF Template',
- 'template' => 'zadani',
- 'filename' => 'Filename-{Text:5}',
- 'notification' => [ '52246fd7af858' ],
- 'conditional' => '1',
- 'conditionalLogic' => [
+ 'name' => 'My First PDF Template',
+ 'template' => 'rubix',
+ 'filename' => 'Filename-{Text:5}',
+ 'notification' => [ '52246fd7af858' ],
+ 'conditional' => '1',
+ 'conditionalLogic' => [
'actionType' => 'show',
'logicType' => 'any',
'rules' => [
[ 'fieldId' => '7', 'operator' => 'is', 'value' => 'Albania' ],
],
],
- 'pdf_size' => 'custom',
- 'custom_pdf_size' => [ '150', '300', 'millimeters' ],
- 'orientation' => 'landscape',
- 'font' => 'dejavusans',
- 'font_size' => 12,
- 'font_colour' => '#929292',
- 'format' => 'PDFA1B',
- 'zadani_border_colour' => '#1C2C1C',
- 'rtl' => 'Yes',
- 'security' => 'Yes',
- 'password' => 'my password',
- 'master_password' => 'test',
- 'privileges' => [ 'copy', 'print' ],
- 'image_dpi' => '300',
- 'show_html' => 'Yes',
- 'public_access' => 'Yes',
- 'restrict_owner' => 'Yes',
- 'background_image' => 'http://test.com/image.jpg',
- 'header' => 'This is a header {Single:5}
',
- 'first_header' => 'My First Page Header 
',
- 'footer' => 'my footer',
- 'first_footer' => 'footer on the first page',
+ 'pdf_size' => 'custom',
+ 'custom_pdf_size' => [ '150', '300', 'millimeters' ],
+ 'orientation' => 'landscape',
+ 'font' => 'dejavusans',
+ 'font_size' => 12,
+ 'font_colour' => '#929292',
+ 'format' => 'PDFA1B',
+ 'rubix_container_background_colour' => '#1C2C1C',
+ 'rtl' => 'Yes',
+ 'security' => 'Yes',
+ 'password' => 'my password',
+ 'master_password' => 'test',
+ 'privileges' => [ 'copy', 'print' ],
+ 'image_dpi' => '300',
+ 'show_html' => 'Yes',
+ 'public_access' => 'Yes',
+ 'restrict_owner' => 'Yes',
+ 'background_image' => 'http://test.com/image.jpg',
+ 'header' => 'This is a header {Single:5}
',
+ 'first_header' => 'My First Page Header ',
+ 'footer' => 'my footer',
+ 'first_footer' => 'footer on the first page',
];
$template_pdf_id = $this->factory->pdf->create( $template_pdf_config );
@@ -253,7 +320,7 @@ public function test_get_item() {
$this->assertEquals( $template_pdf_config['custom_pdf_size'][1], $data['custom_pdf_size']['height'] );
$this->assertSame( $template_pdf_config['custom_pdf_size'][2], str_replace( [ 'mm', 'in' ], [ 'millimeters', 'inches' ], $data['custom_pdf_size']['unit'] ) );
$this->assertSame( $template_pdf_config['orientation'], $data['orientation'] );
- $this->assertSame( '#1C2C1C', $data['zadani_border_colour'] );
+ $this->assertSame( '#1C2C1C', $data['rubix_container_background_colour'] );
$this->assertTrue( $data['show_form_title'] );
$this->assertFalse( $data['show_page_names'] );
$this->assertTrue( $data['show_html'] );
@@ -267,6 +334,12 @@ public function test_get_item() {
$this->assertSame( $template_pdf_config['footer'], $data['footer'] );
$this->assertSame( $template_pdf_config['first_footer'], $data['first_footer'] );
+ $links = $response->get_links();
+ $this->assertArrayHasKey( 'self', $links );
+ $this->assertArrayHasKey( 'admin', $links );
+ $this->assertArrayHasKey( 'collection', $links );
+ $this->assertArrayHasKey( 'form', $links );
+
$this->assertStringContainsString( 'admin.php?page=gf_edit_forms&view=settings&subview=PDF&id=', $response->get_links()['admin'][0]['href'] );
}
@@ -304,17 +377,26 @@ public function test_get_item_with_invalid_form() {
$this->assertSame( 'rest_invalid_param', $data['data']['details']['form']['code'] );
}
+ public function test_get_item_with_invalid_pdf() {
+ /* Test with invalid PDF */
+ $request = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id . '/' . uniqid() );
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertSame( 400, $response->get_status() );
+ $this->assertSame( 'Invalid parameter(s): pdf', $data['message'] );
+ }
+
public function test_create_item() {
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
/* Barebones PDF */
$request->set_body_params( [
- 'name' => 'Simple PDF',
- 'template' => 'zadani',
+ 'name' => 'Simple PDF',
+ 'template' => 'rubix',
] );
$response = rest_get_server()->dispatch( $request );
@@ -323,42 +405,42 @@ public function test_create_item() {
/* Complex PDF */
$request->set_body_params( [
'name' => 'Advanced PDF Template',
- 'template' => 'zadani',
- 'filename' => 'Filename-{Text:5}',
- 'notification' => [ '52246fd7af858' ],
- 'conditionalLogic' => [
+ 'template' => 'rubix',
+ 'filename' => 'Filename-{Text:5}',
+ 'notification' => [ '52246fd7af858' ],
+ 'conditionalLogic' => [
'actionType' => 'show',
'logicType' => 'any',
'rules' => [
[ 'fieldId' => '7', 'operator' => 'is', 'value' => 'Albania' ],
],
],
- 'pdf_size' => 'CUSTOM',
- 'custom_pdf_size' => [
+ 'pdf_size' => 'CUSTOM',
+ 'custom_pdf_size' => [
'width' => '150',
'height' => '300',
'unit' => 'mm',
],
- 'orientation' => 'landscape',
- 'font' => 'dejavusans',
- 'font_size' => 12,
- 'font_colour' => '#929292',
- 'format' => 'PDFA1B',
- 'rtl' => true,
- 'security' => true,
- 'password' => 'my password',
- 'master_password' => 'test',
- 'privileges' => [ 'copy', 'print' ],
- 'image_dpi' => 300,
- 'public_access' => true,
- 'restrict_owner' => true,
-
- 'zadani_border_colour' => '#1C2C1C',
- 'background_image' => 'http://test.com/image.jpg',
- 'header' => 'This is a header {Single:5}
',
- 'first_header' => 'My First Page Header ',
- 'footer' => 'my footer',
- 'first_footer' => 'footer on the first page',
+ 'orientation' => 'landscape',
+ 'font' => 'dejavusans',
+ 'font_size' => 12,
+ 'font_colour' => '#929292',
+ 'format' => 'PDFA1B',
+ 'rtl' => true,
+ 'security' => true,
+ 'password' => 'my password',
+ 'master_password' => 'test',
+ 'privileges' => [ 'copy', 'print' ],
+ 'image_dpi' => 300,
+ 'public_access' => true,
+ 'restrict_owner' => true,
+
+ 'rubix_container_background_colour' => '#1C2C1C',
+ 'background_image' => 'http://test.com/image.jpg',
+ 'header' => 'This is a header {Single:5}
',
+ 'first_header' => 'My First Page Header ',
+ 'footer' => 'my footer',
+ 'first_footer' => 'footer on the first page',
] );
$response = rest_get_server()->dispatch( $request );
@@ -401,13 +483,13 @@ protected function check_template_pdf_data( $pdf, $data, $context, $links ) {
$this->assertSame( $pdf['orientation'], $data['orientation'] );
- $this->assertSame( $pdf['zadani_border_colour'], $data['zadani_border_colour'] );
- $this->assertSame( $pdf['show_form_title'], $data['show_form_title'] ? 'Yes' : '' );
- $this->assertSame( $pdf['show_page_names'], $data['show_page_names'] ? 'Yes' : '' );
- $this->assertSame( $pdf['show_html'], $data['show_html'] ? 'Yes' : '' );
- $this->assertSame( $pdf['show_section_content'], $data['show_section_content'] ? 'Yes' : '' );
- $this->assertSame( $pdf['enable_conditional'], $data['enable_conditional'] ? 'Yes' : '' );
- $this->assertSame( $pdf['show_empty'], $data['show_empty'] ? 'Yes' : '' );
+ $this->assertSame( $pdf['rubix_container_background_colour'], $data['rubix_container_background_colour'] );
+ $this->assertSame( $pdf['show_form_title'], $data['show_form_title'] ? 'Yes' : 'No' );
+ $this->assertSame( $pdf['show_page_names'], $data['show_page_names'] ? 'Yes' : 'No' );
+ $this->assertSame( $pdf['show_html'], $data['show_html'] ? 'Yes' : 'No' );
+ $this->assertSame( $pdf['show_section_content'], $data['show_section_content'] ? 'Yes' : 'No' );
+ $this->assertSame( $pdf['enable_conditional'], $data['enable_conditional'] ? 'Yes' : 'No' );
+ $this->assertSame( $pdf['show_empty'], $data['show_empty'] ? 'Yes' : 'No' );
$this->assertSame( $pdf['background_color'], $data['background_color'] );
$this->assertSame( $pdf['background_image'], $data['background_image'] );
@@ -431,24 +513,24 @@ protected function check_common_pdf_data( $pdf, $data, $context, $links ) {
$this->assertSame( array_values( $pdf['notification'] ), $data['notification'] );
$this->assertSame( $pdf['conditionalLogic'], $data['conditionalLogic'] );
- $this->assertEquals( $pdf['conditional'], $data['conditional'] );
+ $this->assertEquals( $pdf['conditional'] === 'Yes', $data['conditional'] );
$this->assertSame( $pdf['font'], $data['font'] );
$this->assertEquals( $pdf['font_size'], $data['font_size'] );
$this->assertSame( $pdf['font_colour'], $data['font_colour'] );
- $this->assertSame( $pdf['rtl'], $data['rtl'] ? 'Yes' : '' );
+ $this->assertSame( $pdf['rtl'], $data['rtl'] ? 'Yes' : 'No' );
$this->assertSame( $pdf['format'], $data['format'] );
- $this->assertSame( $pdf['security'], $data['security'] ? 'Yes' : '' );
+ $this->assertSame( $pdf['security'], $data['security'] ? 'Yes' : 'No' );
$this->assertSame( array_values( $pdf['privileges'] ), $data['privileges'] );
$this->assertSame( $pdf['password'], $data['password'] );
$this->assertSame( $pdf['master_password'], $data['master_password'] );
$this->assertEquals( $pdf['image_dpi'], $data['image_dpi'] );
- $this->assertSame( $pdf['public_access'], $data['public_access'] ? 'Yes' : '' );
- $this->assertSame( $pdf['restrict_owner'], $data['restrict_owner'] ? 'Yes' : '' );
+ $this->assertSame( $pdf['public_access'], $data['public_access'] ? 'Yes' : 'No' );
+ $this->assertSame( $pdf['restrict_owner'], $data['restrict_owner'] ? 'Yes' : 'No' );
if ( $links ) {
$links = test_rest_expand_compact_links( $links );
@@ -467,8 +549,8 @@ public function test_create_item_invalid_permission() {
/* Barebones PDF */
$request->set_body_params( [
- 'name' => 'Simple PDF',
- 'template' => 'zadani',
+ 'name' => 'Simple PDF',
+ 'template' => 'rubix',
] );
$response = rest_get_server()->dispatch( $request );
@@ -491,18 +573,38 @@ public function test_create_item_invalid_permission() {
$this->assertSame( 201, $response->get_status() );
}
+ public function test_create_item_with_existing_pdf() {
+ $pdf_id = $this->factory->pdf->create();
+
+ wp_set_current_user( self::$admin_id );
+
+ $request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
+ $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+
+ /* Barebones PDF */
+ $request->set_body_params( [
+ 'pdf' => $pdf_id,
+ 'name' => 'Simple PDF',
+ 'template' => 'rubix',
+ ] );
+
+ $response = rest_get_server()->dispatch( $request );
+
+ $this->assertSame( 400, $response->get_status() );
+ $this->assertSame( 'Cannot create existing PDF.', $response->get_data()['message'] );
+ }
+
public function test_update_item() {
$template_pdf_id = $this->factory->pdf->create( [
- 'template' => 'zadani',
- 'filename' => 'Filename-{Text:5}',
- 'pdf_size' => 'LETTER',
- 'zadani_border_colour' => '#1C2C1C',
+ 'template' => 'rubix',
+ 'filename' => 'Filename-{Text:5}',
+ 'pdf_size' => 'LETTER',
+ 'rubix_container_background_colour' => '#1C2C1C',
] );
wp_set_current_user( self::$admin_id );
/* Get original PDF */
- $this->controller->reregister_routes( 'zadani' );
$request = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id . '/' . $template_pdf_id );
$request->set_param( 'context', 'edit' );
$response = rest_get_server()->dispatch( $request );
@@ -514,9 +616,9 @@ public function test_update_item() {
/* Override a couple of the settings */
$request->set_body_params( [
- 'filename' => 'Zadani Document',
- 'pdf_size' => 'A3',
- 'zadani_border_colour' => '#000000',
+ 'filename' => 'Zadani Document',
+ 'pdf_size' => 'A3',
+ 'rubix_container_background_colour' => '#000000',
] );
$response = rest_get_server()->dispatch( $request );
@@ -526,17 +628,17 @@ public function test_update_item() {
$this->assertSame( $template_pdf_id, $data['id'] );
$this->assertSame( 'Zadani Document', $data['filename'] );
$this->assertSame( 'A3', $data['pdf_size'] );
- $this->assertSame( '#000000', $data['zadani_border_colour'] );
+ $this->assertSame( '#000000', $data['rubix_container_background_colour'] );
- unset( $original_data['filename'], $original_data['pdf_size'], $original_data['zadani_border_colour'] );
- unset( $data['filename'], $data['pdf_size'], $data['zadani_border_colour'] );
+ unset( $original_data['filename'], $original_data['pdf_size'], $original_data['rubix_container_background_colour'] );
+ unset( $data['filename'], $data['pdf_size'], $data['rubix_container_background_colour'] );
$this->assertSame( $original_data, $data );
$pdf = \GPDFAPI::get_pdf( $this->form_id, $template_pdf_id );
$this->assertSame( 'Zadani Document', $pdf['filename'] );
$this->assertSame( 'A3', $pdf['pdf_size'] );
- $this->assertSame( '#000000', $pdf['zadani_border_colour'] );
+ $this->assertSame( '#000000', $pdf['rubix_container_background_colour'] );
}
public function test_update_item_invalid_permission() {
@@ -572,8 +674,26 @@ public function test_update_item_invalid_permission() {
$this->assertSame( 200, $response->get_status() );
}
+ public function test_update_item_with_invalid_pdf() {
+ wp_set_current_user( self::$admin_id );
+
+ $request = new WP_REST_Request( 'PUT', '/gravity-pdf/v1/form/' . $this->form_id . '/' . uniqid() );
+ $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+
+ /* Barebones PDF */
+ $request->set_body_params( [
+ 'name' => 'Simple PDF',
+ 'template' => 'rubix',
+ ] );
+
+ $response = rest_get_server()->dispatch( $request );
+
+ $this->assertSame( 400, $response->get_status() );
+ $this->assertSame( 'Invalid parameter(s): pdf', $response->get_data()['message'] );
+ }
+
public function test_delete_item() {
- $template_pdf_id = $this->factory->pdf->create( [ 'template' => 'zadani', 'header' => 'Custom Header' ] );
+ $template_pdf_id = $this->factory->pdf->create( [ 'template' => 'rubix', 'header' => 'Custom Header' ] );
$this->factory->pdf->create( [ 'template' => 'rubix' ] );
wp_set_current_user( self::$admin_id );
@@ -621,18 +741,27 @@ public function test_delete_item_invalid_permission() {
$this->assertTrue( $data['deleted'] );
}
+ public function test_delete_item_with_invalid_pdf() {
+ wp_set_current_user( self::$admin_id );
+
+ /* Test Template PDF */
+ $request = new WP_REST_Request( 'DELETE', '/gravity-pdf/v1/form/' . $this->form_id . '/' . uniqid() );
+ $response = rest_get_server()->dispatch( $request );
+
+ $this->assertSame( 400, $response->get_status() );
+ $this->assertSame( 'Invalid parameter(s): pdf', $response->get_data()['message'] );
+ }
+
public function test_prepare_item() {
$template_pdf_id = $this->factory->pdf->create( [
- 'template' => 'zadani',
- 'filename' => 'Filename-{Text:5}',
- 'pdf_size' => 'LETTER',
- 'zadani_border_colour' => '#1C2C1C',
+ 'template' => 'rubix',
+ 'filename' => 'Filename-{Text:5}',
+ 'pdf_size' => 'LETTER',
+ 'rubix_container_background_colour' => '#1C2C1C',
] );
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
-
$request = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id . '/' . $template_pdf_id );
/* Test contexts */
@@ -641,7 +770,7 @@ public function test_prepare_item() {
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
- $fields = array_filter( $this->controller->get_fields_for_response( $request ), function ( $item ) {
+ $fields = array_filter( $this->api->get_fields_for_response( $request ), function ( $item ) {
return ! in_array( $item, [ '_links', '_embedded' ], true );
} );
@@ -661,9 +790,8 @@ public function test_prepare_item() {
}
public function test_get_item_schema() {
- $this->controller->reregister_routes( 'zadani' );
-
- $request = new WP_REST_Request( 'OPTIONS', '/gravity-pdf/v1/form/' . $this->form_id );
+ $request = new WP_REST_Request( 'OPTIONS', '/gravity-pdf/v1/form/' . $this->form_id );
+ $request->set_query_params( [ 'template' => 'rubix' ] );
$response = rest_do_request( $request );
$data = $response->get_data();
$args = $data['endpoints'][1]['args'];
@@ -706,14 +834,13 @@ public function test_get_item_schema() {
*/
public function test_input_validation_create() {
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
/* Check valid form ID */
$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/4751' );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
'name' => 'Label',
- 'template' => 'zadani',
+ 'template' => 'rubix',
] );
$response = rest_get_server()->dispatch( $request );
@@ -727,7 +854,6 @@ public function test_input_validation_create() {
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
- 'name' => '',
'template' => 'non-existent-template',
'active' => 1,
'notification' => [
@@ -746,7 +872,6 @@ public function test_input_validation_create() {
$this->assertSame( 400, $response->get_status() );
- $this->assertSame( 'rest_invalid_param', $data['data']['details']['name']['code'] );
$this->assertSame( 'rest_not_in_enum', $data['data']['details']['template']['code'] );
$this->assertSame( 'rest_not_in_enum', $data['data']['details']['notification']['code'] );
$this->assertSame( 'rest_property_required', $data['data']['details']['conditionalLogic']['code'] );
@@ -759,14 +884,13 @@ public function test_input_validation_create() {
*/
public function test_input_validation_update() {
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
/* Check valid form and PDF ID */
$request = new WP_REST_Request( 'PUT', '/gravity-pdf/v1/form/4751/abcdef1234567' );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
'name' => 'Label',
- 'template' => 'zadani',
+ 'template' => 'rubix',
] );
$response = rest_get_server()->dispatch( $request );
@@ -781,7 +905,7 @@ public function test_input_validation_update() {
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
'name' => 'Label',
- 'template' => 'zadani',
+ 'template' => 'rubix',
] );
$response = rest_get_server()->dispatch( $request );
@@ -793,7 +917,6 @@ public function test_input_validation_update() {
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
- 'name' => '',
'template' => 'non-existent-template',
'active' => 1,
'notification' => [
@@ -812,7 +935,6 @@ public function test_input_validation_update() {
$this->assertSame( 400, $response->get_status() );
- $this->assertSame( 'rest_invalid_param', $data['data']['details']['name']['code'] );
$this->assertSame( 'rest_not_in_enum', $data['data']['details']['template']['code'] );
$this->assertSame( 'rest_not_in_enum', $data['data']['details']['notification']['code'] );
$this->assertSame( 'rest_property_required', $data['data']['details']['conditionalLogic']['code'] );
@@ -825,10 +947,9 @@ public function test_input_validation_update() {
*/
public function test_input_validation_delete() {
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
/* Check valid form and PDF ID */
- $request = new WP_REST_Request( 'DELETE', '/gravity-pdf/v1/form/4751/abcdef1234567' );
+ $request = new WP_REST_Request( 'DELETE', '/gravity-pdf/v1/form/4751/abcdef1234567' );
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
@@ -842,15 +963,14 @@ public function test_input_validation_delete() {
*/
public function test_input_sanitizing_create() {
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
- 'name' => 'My Label {:20:value} %10',
- 'template' => 'zadani',
- 'font_size' => '20',
- 'header' => 'My link Item',
+ 'name' => 'My Label {:20:value} %10',
+ 'template' => 'rubix',
+ 'font_size' => '20',
+ 'header' => 'My link Item',
'public_access' => true,
] );
@@ -877,14 +997,13 @@ public function test_input_sanitizing_create() {
*/
public function test_input_sanitizing_update() {
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
/* Create valid PDF */
$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
'name' => 'Label',
- 'template' => 'zadani',
+ 'template' => 'rubix',
] );
$response = rest_get_server()->dispatch( $request );
@@ -895,9 +1014,9 @@ public function test_input_sanitizing_update() {
$request = new WP_REST_Request( 'PUT', '/gravity-pdf/v1/form/' . $this->form_id . '/' . $pdf_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
- 'name' => 'My Label {:20:value} %10',
- 'font_size' => '20',
- 'header' => 'My link Item',
+ 'name' => 'My Label {:20:value} %10',
+ 'font_size' => '20',
+ 'header' => 'My link Item',
'public_access' => true,
] );
@@ -924,14 +1043,13 @@ public function test_input_sanitizing_update() {
*/
public function test_get_and_update_callbacks() {
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
/* Check custom PDF size is not saved if pdf_size is not custom */
$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
'name' => 'Label',
- 'template' => 'zadani',
+ 'template' => 'rubix',
'pdf_size' => 'A4',
'custom_pdf_size' => [
'width' => 300,
@@ -952,7 +1070,7 @@ public function test_get_and_update_callbacks() {
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
'name' => 'Label',
- 'template' => 'zadani',
+ 'template' => 'rubix',
'pdf_size' => 'CUSTOM',
'custom_pdf_size' => [
'width' => 300,
@@ -975,17 +1093,20 @@ public function test_get_and_update_callbacks() {
}
public function test_default_custom_pdf_size() {
+ /* Update the default plugin options */
\GPDFAPI::update_plugin_option( 'default_pdf_size', 'CUSTOM' );
\GPDFAPI::update_plugin_option( 'default_custom_pdf_size', [ 5, 7, 'inches' ] );
+ /* Reregister the endpoints with new schema */
+ $this->api->register_routes();
+
+ /* Run the API request */
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
- 'name' => 'Label',
- 'template' => 'zadani',
+ 'name' => 'Label',
] );
$response = rest_get_server()->dispatch( $request );
@@ -1004,16 +1125,15 @@ public function test_default_custom_pdf_size() {
public function test_custom_pdf_size() {
wp_set_current_user( self::$admin_id );
- $this->controller->reregister_routes( 'zadani' );
/* test for an invalid option */
$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
- 'name' => 'Label',
- 'template' => 'zadani',
- 'pdf_size' => 'CUSTOM',
- 'custom_pdf_size' => [ 5, 7, 'inches'],
+ 'name' => 'Label',
+ 'template' => 'rubix',
+ 'pdf_size' => 'CUSTOM',
+ 'custom_pdf_size' => [ 5, 7, 'inches' ],
] );
$response = rest_get_server()->dispatch( $request );
@@ -1023,13 +1143,13 @@ public function test_custom_pdf_size() {
$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
$request->set_body_params( [
- 'name' => 'Label',
- 'template' => 'zadani',
- 'pdf_size' => 'CUSTOM',
+ 'name' => 'Label',
+ 'template' => 'rubix',
+ 'pdf_size' => 'CUSTOM',
'custom_pdf_size' => [
- 'width' => 5.0,
+ 'width' => 5.0,
'height' => 4.0,
- 'unit' => 'in',
+ 'unit' => 'in',
],
] );
@@ -1037,30 +1157,10 @@ public function test_custom_pdf_size() {
$this->assertSame( 201, $response->get_status() );
}
- public function filter_rest_url_for_leading_slash( $url, $path ) {
- if ( is_multisite() || get_option( 'permalink_structure' ) ) {
- return $url;
- }
-
- // Make sure path for rest_url has a leading slash for proper resolution.
- if ( 0 !== strpos( $path, '/' ) ) {
- $this->fail(
- sprintf(
- 'REST API URL "%s" should have a leading slash.',
- $path
- )
- );
- }
-
- return $url;
- }
-
public function test_assign_template_for_schema() {
- $GLOBALS['wp']->query_vars['rest_route'] = '/' . $this->controller::NAMESPACE . $this->controller::API_BASE;
- $_POST['template'] = 'focus-gravity';
- $this->controller->register_routes();
+ $this->api->get_template_schema( 'focus-gravity' );
- $schema = $this->controller->get_item_schema();
+ $schema = $this->api->get_item_schema();
/* Check the template-specific properties are included */
$this->assertArrayHasKey( 'show_form_title', $schema['properties'] );
@@ -1069,22 +1169,45 @@ public function test_assign_template_for_schema() {
$this->assertArrayHasKey( 'header', $schema['properties'] );
$this->assertArrayHasKey( 'first_header', $schema['properties'] );
$this->assertArrayHasKey( 'background_color', $schema['properties'] );
+ $this->assertArrayHasKey( 'focusgravity_accent_colour', $schema['properties'] );
}
- public function test_dont_assign_template_for_schema() {
- /* Check we only match our specific endpoint */
- $GLOBALS['wp']->query_vars['rest_route'] = '/' . $this->controller::NAMESPACE;
- $_POST['template'] = 'focus-gravity';
- $this->controller->register_routes();
+ public function test_get_schema_for_template() {
+ wp_set_current_user( self::$admin_id );
+
+ $request = new WP_REST_Request( 'GET', '/' . $this->api::get_route_basepath() . '/' . $this->form_id . '/schema' );
+ $request->set_query_params( [
+ 'template' => 'rubix',
+ ]
+ );
- $schema = $this->controller->get_item_schema();
+ $response = rest_get_server()->dispatch( $request );
+ $schema = $response->get_data();
- /* Check the template-specific properties are included */
- $this->assertArrayNotHasKey( 'show_form_title', $schema['properties'] );
- $this->assertArrayNotHasKey( 'show_html', $schema['properties'] );
- $this->assertArrayNotHasKey( 'show_section_content', $schema['properties'] );
- $this->assertArrayNotHasKey( 'header', $schema['properties'] );
- $this->assertArrayNotHasKey( 'first_header', $schema['properties'] );
- $this->assertArrayNotHasKey( 'background_color', $schema['properties'] );
+ $this->test_for_pdf_settings( $schema['properties'] );
+
+ /* Filter fields by context */
+ $request->set_query_params( [
+ 'template' => 'focus-gravity',
+ 'context' => 'template',
+ ] );
+
+ $response = rest_get_server()->dispatch( $request );
+ $schema = $response->get_data();
+
+ $this->assertArrayHasKey( 'show_form_title', $schema['properties'] );
+ $this->assertArrayHasKey( 'show_html', $schema['properties'] );
+ $this->assertArrayHasKey( 'show_section_content', $schema['properties'] );
+ $this->assertArrayHasKey( 'header', $schema['properties'] );
+ $this->assertArrayHasKey( 'first_header', $schema['properties'] );
+ $this->assertArrayHasKey( 'background_color', $schema['properties'] );
+ $this->assertArrayHasKey( 'focusgravity_accent_colour', $schema['properties'] );
+
+ $this->assertArrayNotHasKey( 'form', $schema['properties'] );
+ $this->assertArrayNotHasKey( 'active', $schema['properties'] );
+ $this->assertArrayNotHasKey( 'name', $schema['properties'] );
+ $this->assertArrayNotHasKey( 'filename', $schema['properties'] );
+ $this->assertArrayNotHasKey( 'notification', $schema['properties'] );
+ $this->assertArrayNotHasKey( 'conditionalLogic', $schema['properties'] );
}
}
diff --git a/tests/phpunit/unit-tests/Rest/Test_Rest_Pdf_Preview.php b/tests/phpunit/unit-tests/Rest/Test_Rest_Pdf_Preview.php
new file mode 100644
index 000000000..4c767caf3
--- /dev/null
+++ b/tests/phpunit/unit-tests/Rest/Test_Rest_Pdf_Preview.php
@@ -0,0 +1,143 @@
+api = new Rest_Pdf_Preview( $gfpdf->options, $gfpdf->gform, $gfpdf->misc, $gfpdf->templates );
+
+ parent::set_up();
+
+ /* Configure mPDF with available fonts */
+ $config = static function ( $config ) {
+ return array_merge( $config, [
+ 'fontDir' => __DIR__ . '/../../data/fonts/',
+ 'fontdata' => [
+ 'dejavusans' => [
+ 'R' => 'DejaVuSans.ttf',
+ 'useOTL' => 0xff,
+ 'useKashida' => 75,
+ ],
+ ],
+
+ 'backupSubsFont' => [],
+ 'backupSIPFont' => '',
+ 'BMPonly' => [ 'dejavusans' ],
+ ] );
+ };
+
+ add_filter( 'gfpdf_mpdf_class_config', $config );
+ }
+
+ public function test_register_routes() {
+ $routes = rest_get_server()->get_routes();
+
+ foreach ( $this->api::$endpoints as $route ) {
+ $this->assertArrayHasKey( '/' . $this->api::NAMESPACE . $route, $routes );
+ }
+ }
+
+ public function test_create_item_preview() {
+
+ $request = new WP_REST_Request( 'POST', '/' . $this->api::get_route_basepath() . '/' . $this->form_id . '/preview' );
+ $request->set_body_params( [
+ 'name' => 'Document',
+ 'filename' => 'Filename',
+ ] );
+
+ /* Test for authentication error */
+ $response = rest_get_server()->dispatch( $request );
+ $this->assertEquals( 401, $response->get_status() );
+
+ /* Test the PDF generator creates the preview */
+ wp_set_current_user( self::$admin_id );
+
+ /* Test the PDF was actually created */
+ $response = rest_get_server()->dispatch( $request );
+
+ $this->assertEquals( 500, $response->get_status() );
+ $this->assertEquals( 'headers_sent', $response->get_data()['code'] );
+ }
+
+ public function test_create_item_preview_with_entry() {
+
+ $entry = $this->factory->entry->create_and_get( [ 'form_id' => $this->form_id ] );
+
+ wp_set_current_user( self::$admin_id );
+
+ $request = new WP_REST_Request( 'POST', '/' . $this->api::get_route_basepath() . '/' . $this->form_id . '/preview' );
+ $request->set_body_params( [
+ 'name' => 'Document',
+ 'filename' => 'Filename',
+ 'entry' => $entry['id'],
+ ] );
+
+ /* Test the PDF was actually created */
+ $response = rest_get_server()->dispatch( $request );
+
+ $this->assertEquals( 500, $response->get_status() );
+ $this->assertEquals( 'headers_sent', $response->get_data()['code'] );
+
+ /* Don't pass the entry */
+ $request->set_body_params( [
+ 'name' => 'Document',
+ 'filename' => 'Filename',
+ ] );
+
+ $response = rest_get_server()->dispatch( $request );
+
+ $this->assertEquals( 500, $response->get_status() );
+ $this->assertEquals( 'headers_sent', $response->get_data()['code'] );
+ }
+
+ public function test_create_item_preview_with_invalid_entry() {
+ wp_set_current_user( self::$admin_id );
+
+ $request = new WP_REST_Request( 'POST', '/' . $this->api::get_route_basepath() . '/' . $this->form_id . '/preview' );
+ $request->set_body_params( [
+ 'name' => 'Document',
+ 'filename' => 'Filename',
+ 'entry' => 520,
+ ] );
+
+ /* Test for error with invalid entry ID */
+ $response = rest_get_server()->dispatch( $request );
+ $this->assertEquals( 400, $response->get_status() );
+
+ /* Test for error with invalid entry ID for requested form */
+ $form_id = $this->factory->form->create();
+ $entry_id = $this->factory->entry->create( [ 'form_id' => $this->form_id ] );
+
+ $request = new WP_REST_Request( 'POST', '/' . $this->api::get_route_basepath() . '/' . $form_id . '/preview' );
+
+ $request->set_body_params( [
+ 'name' => 'Document',
+ 'filename' => 'Filename',
+ 'entry' => $entry_id,
+ ] );
+
+ $response = rest_get_server()->dispatch( $request );
+ $this->assertEquals( 400, $response->get_status() );
+ }
+}
diff --git a/tests/phpunit/unit-tests/php/simple_config b/tests/phpunit/unit-tests/php/simple_config
deleted file mode 100644
index dd75f3fed..000000000
--- a/tests/phpunit/unit-tests/php/simple_config
+++ /dev/null
@@ -1,106 +0,0 @@
- 'default-template.php',
- 'pdf_size' => 'A4',
- );
-
- /*
- * ------------------------------------------------------------
- * Bare minimum configuration code
- * Usage: Will generate PDF and send to all notifications
- * Remove the comments around the code blocks below to use (/*)
- * form_id Mixed - Integer or Array. Required. The Gravity Form ID you are assigning the PDF to.
- * notifications Mixed - String, Boolean or Array.
- */
-
- $gf_pdf_config[] = array(
- 'form_id' => 1,
- 'notifications' => true,
- 'premium' => true,
- 'template' => 'health-care-directive.php',
- );
-
- $gf_pdf_config[] = array(
- 'form_id' => 1,
- 'template' => 'example-template.php',
- 'filename' => 'testman.pdf',
- 'notifications' => 'Admin Notification',
- 'access' => 'all',
- );
-
- $gf_pdf_config[] = array(
- 'form_id' => 1,
- 'template' => 'default-template-no-style.php',
- 'filename' => 'Double Trouble.pdf',
- 'default-show-html' => true,
- 'default-show-empty' => true,
- 'default-show-page-names' => true,
- 'default-show-section-content' => true,
- );
-
- $gf_pdf_config[] = array(
- 'form_id' => 1,
- 'notifications' => true,
- 'filename' => 'testman.pdf',
-
- 'security' => true,
- 'pdf_password' => 'myPDFpass',
- 'pdf_privileges' => array('copy', 'print', 'modify', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-highres'),
- 'pdf_master_password' => 'admin password',
- );
-
- $gf_pdf_config[] = array(
- 'form_id' => 1,
- 'filename' => 'testman2.pdf',
- 'notifications' => array('Admin Notification', 'User Notification'),
-
- 'security' => true,
- 'pdf_password' => '',
- 'pdf_privileges' => array('copy', 'print', 'extract', 'assemble', 'print-highres'),
- 'pdf_master_password' => 'adfawfawr5q2atd',
- );
-
- $gf_pdf_config[] = array(
- 'form_id' => 1,
- 'filename' => 'testman3.pdf',
-
- 'security' => true,
- 'pdf_password' => '',
- 'pdf_master_password' => '',
- );
-
- $gf_pdf_config[] = array(
- 'form_id' => 1,
- 'orientation' => 'landscape',
- 'pdf_size' => 'letter',
- 'rtl' => true,
- 'pdfa1b' => true,
- 'dpi' => 300,
- );
-
- /* Custom PDF Size */
- $gf_pdf_config[] = array(
- 'form_id' => 1,
- 'notifications' => 'Admin Notification',
- 'pdf_size' => array(50, 200),
- 'save' => true,
- 'pdfx1a' => true,
- 'dpi' => 300,
- );
diff --git a/tests/phpunit/unit-tests/test-ajax.php b/tests/phpunit/unit-tests/test-ajax.php
index bd1fd426d..1c3cf4e56 100644
--- a/tests/phpunit/unit-tests/test-ajax.php
+++ b/tests/phpunit/unit-tests/test-ajax.php
@@ -79,7 +79,7 @@ public static function set_up_before_class() {
* @since 4.0
*/
private function import_form() {
- $json = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/form-settings.json' ) ), true );
+ $json = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/form-settings.json' ) ), true );
$this->form_id = GFAPI::add_form( $json );
}
diff --git a/tests/phpunit/unit-tests/test-api.php b/tests/phpunit/unit-tests/test-api.php
index 0f1ed7356..b9293d4df 100644
--- a/tests/phpunit/unit-tests/test-api.php
+++ b/tests/phpunit/unit-tests/test-api.php
@@ -236,7 +236,7 @@ public function test_add_pdf_font() {
$this->assertEquals( 'font_validation_error', $results->get_error_code() );
/* Test we correctly install the font */
- $ttf_file = __DIR__ . '/fonts/Chewy.ttf';
+ $ttf_file = __DIR__ . '/../data/fonts/Chewy.ttf';
$font = [
'font_name' => 'Test',
@@ -254,7 +254,7 @@ public function test_add_pdf_font() {
}
public function test_add_pdf_font_duplicate() {
- $ttf_file = __DIR__ . '/fonts/Chewy.ttf';
+ $ttf_file = __DIR__ . '/../data/fonts/Chewy.ttf';
$font = [
'font_name' => 'Test',
@@ -284,7 +284,7 @@ public function test_delete_pdf_font() {
$this->assertEquals( 'invalid_font_id', $results->get_error_code() );
/* Add a font and then see if we can remove it */
- $ttf_file = __DIR__ . '/fonts/Chewy.ttf';
+ $ttf_file = __DIR__ . '/../data/fonts/Chewy.ttf';
$font = [
'font_name' => 'Test',
diff --git a/tests/phpunit/unit-tests/test-form-data.php b/tests/phpunit/unit-tests/test-form-data.php
index 4f45a7f8d..e5bcec63a 100644
--- a/tests/phpunit/unit-tests/test-form-data.php
+++ b/tests/phpunit/unit-tests/test-form-data.php
@@ -267,7 +267,7 @@ public function test_field_number() {
* Test that number fields will use the local currency set in the entry
*/
public function test_field_number_currency() {
- $form_json = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/number-fields.json' ) ), true );
+ $form_json = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/number-fields.json' ) ), true );
$form_id = GFAPI::add_form( $form_json );
$entry_id = GFAPI::add_entry(
@@ -1536,7 +1536,7 @@ public function test_empty_fields() {
* Ensure the Product data calculations are correct when using Euros (or similar comma/decimal switched currency)
*/
public function test_euro_product_data() {
- $json = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/all-form-euro-product-entry.json' ) ), true );
+ $json = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/all-form-euro-product-entry.json' ) ), true );
$json['form_id'] = $this->form['id'];
$entry_id = GFAPI::add_entry( $json );
$entry = GFAPI::get_entry( $entry_id );
diff --git a/tests/phpunit/unit-tests/test-form-settings.php b/tests/phpunit/unit-tests/test-form-settings.php
index e61cd26e7..082bf98ba 100644
--- a/tests/phpunit/unit-tests/test-form-settings.php
+++ b/tests/phpunit/unit-tests/test-form-settings.php
@@ -468,7 +468,7 @@ public function test_settings_sanitize() {
remove_all_filters( 'gfpdf_form_settings_sanitize_hidden' );
/* get faux input data */
- $input = json_decode( file_get_contents( dirname( __FILE__ ) . '/json/form-settings-sample-input.json' ), true );
+ $input = json_decode( file_get_contents( __DIR__ . '/../data/json/form-settings-sample-input.json' ), true );
/* Set up global filters we can check */
add_filter(
diff --git a/tests/phpunit/unit-tests/test-options-api.php b/tests/phpunit/unit-tests/test-options-api.php
index 17a44c19e..85a24ec15 100644
--- a/tests/phpunit/unit-tests/test-options-api.php
+++ b/tests/phpunit/unit-tests/test-options-api.php
@@ -56,7 +56,7 @@ public function set_up() {
$this->options = \GPDFAPI::get_options_class();
/* load settings in database */
- update_option( 'gfpdf_settings', json_decode( file_get_contents( dirname( __FILE__ ) . '/json/options-settings.json' ), true ) );
+ update_option( 'gfpdf_settings', json_decode( file_get_contents( __DIR__ . '/../data/json/options-settings.json' ), true ) );
/* Load a form / form PDF settings into database */
$this->form_id = $GLOBALS['GFPDF_Test']->form['form-settings']['id'];
diff --git a/tests/phpunit/unit-tests/test-shortcodes.php b/tests/phpunit/unit-tests/test-shortcodes.php
index e4347f9ee..f66aea44a 100644
--- a/tests/phpunit/unit-tests/test-shortcodes.php
+++ b/tests/phpunit/unit-tests/test-shortcodes.php
@@ -388,7 +388,7 @@ public function test_gravitypdf_notification() {
public function test_add_shortcode_attr() {
/* Setup our test data */
- $content = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/shortcode-data.json' ) ), true );
+ $content = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/shortcode-data.json' ) ), true );
$shortcodes = $this->model->get_shortcode_information( 'gravitypdf', $content );
@@ -481,7 +481,7 @@ public function test_gravitypdf_redirect_confirmation_shortcode_processing() {
* @since 4.0
*/
public function test_get_shortcode_information() {
- $content = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/shortcode-data.json' ) ), true );
+ $content = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/shortcode-data.json' ) ), true );
$this->assertCount( 0, $this->model->get_shortcode_information( 'gravitypdf', [] ) );
diff --git a/tests/phpunit/unit-tests/test-slow-pdf-processes.php b/tests/phpunit/unit-tests/test-slow-pdf-processes.php
index f33cc3d4e..1f423b056 100644
--- a/tests/phpunit/unit-tests/test-slow-pdf-processes.php
+++ b/tests/phpunit/unit-tests/test-slow-pdf-processes.php
@@ -75,7 +75,7 @@ public function set_up() {
$this->controller = new Controller_PDF( $this->model, $this->view, $gfpdf->gform, $gfpdf->log, $gfpdf->misc );
- $fonts = glob( dirname( __FILE__ ) . '/fonts/' . '*.[tT][tT][fF]' );
+ $fonts = glob( __DIR__ . '/../data/fonts/' . '*.[tT][tT][fF]' );
$fonts = ( is_array( $fonts ) ) ? $fonts : [];
foreach ( $fonts as $font ) {
@@ -153,9 +153,14 @@ public function test_process_legacy_pdf_endpoint() {
try {
$user_id = $this->factory->user->create( [ 'role' => 'administrator' ] );
wp_set_current_user( $user_id );
+
+ add_action( 'gfpdf_post_view_or_download_pdf', function () {
+ wp_die( 'PDF generated successfully' );
+ } );
+
$this->controller->process_legacy_pdf_endpoint();
} catch ( Exception $e ) {
- $this->assertEquals( 'The PDF cannot be displayed because the server headers have already been sent.', $e->getMessage() );
+ $this->assertEquals( 'PDF generated successfully', $e->getMessage() );
return;
}
@@ -164,7 +169,7 @@ public function test_process_legacy_pdf_endpoint() {
}
/**
- * Test the DF endpoint is secured and will generate a PDF successfully
+ * Test the PDF endpoint is secured and will generate a PDF successfully
*/
public function test_process_pdf_endpoint() {
@@ -187,9 +192,14 @@ public function test_process_pdf_endpoint() {
try {
$user_id = $this->factory->user->create( [ 'role' => 'administrator' ] );
wp_set_current_user( $user_id );
+
+ add_action( 'gfpdf_post_view_or_download_pdf', function () {
+ wp_die( 'PDF generated successfully' );
+ } );
+
$this->controller->process_pdf_endpoint();
} catch ( Exception $e ) {
- $this->assertEquals( 'The PDF cannot be displayed because the server headers have already been sent.', $e->getMessage() );
+ $this->assertEquals( 'PDF generated successfully', $e->getMessage() );
return;
}