Merge pull request #515 from contactashish13/issue-514

Cloning a chart resets the chart library to Google

Author: contactashish13

classes/Visualizer/Module/Chart.php

@@ -443,6 +443,7 @@ public function renderChartPages() {
 				add_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, 1 );
 				add_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
 				add_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
+				add_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, '' );
 				add_post_meta(
 					$chart_id,
 					Visualizer_Plugin::CF_SETTINGS,
@@ -1022,19 +1023,10 @@ public function uploadData() {
 	 */
 	public function cloneChart() {
 		$chart_id = $success = false;
-		$nonce    = wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), Visualizer_Plugin::ACTION_CLONE_CHART );
+		$nonce    = isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'], Visualizer_Plugin::ACTION_CLONE_CHART );
 		$capable  = current_user_can( 'edit_posts' );
 		if ( $nonce && $capable ) {
-			$chart_id = filter_input(
-				INPUT_GET,
-				'chart',
-				FILTER_VALIDATE_INT,
-				array(
-					'options' => array(
-						'min_range' => 1,
-					),
-				)
-			);
+			$chart_id = isset( $_GET['chart'] ) ? filter_var( $_GET['chart'], FILTER_VALIDATE_INT ) : '';
 			if ( $chart_id ) {
 				$chart   = get_post( $chart_id );
 				$success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
@@ -1053,6 +1045,7 @@ public function cloneChart() {
 			);
 			if ( $new_chart_id && ! is_wp_error( $new_chart_id ) ) {
 				add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_TYPE, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ) );
+				add_post_meta( $new_chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true ) );
 				add_post_meta( $new_chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, get_post_meta( $chart_id, Visualizer_Plugin::CF_DEFAULT_DATA, true ) );
 				add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SOURCE, get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true ) );
 				add_post_meta( $new_chart_id, Visualizer_Plugin::CF_SERIES, get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true ) );
@@ -1067,6 +1060,11 @@ public function cloneChart() {
 				);
 			}
 		}
+
+		if ( defined( 'WP_TESTS_DOMAIN' ) ) {
+			wp_die();
+		}
+
 		wp_redirect( $redirect );
 		exit;
 	}

tests/test-import.php

@@ -21,6 +21,60 @@ class Test_Import extends WP_Ajax_UnitTestCase {
 	 */
 	private $chart;
 
+	/**
+	 * Testing cloing of chart.
+	 *
+	 * @access public
+	 */
+	public function test_clone_chart() {
+		$this->create_chart();
+		$this->_setRole( 'administrator' );
+		$_GET  = array(
+			'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_CLONE_CHART ),
+			'chart' => $this->chart,
+		);
+		// swallow the output
+		ob_start();
+		try {
+			$this->_handleAjax( 'visualizer-clone-chart' );
+		} catch ( WPAjaxDieContinueException  $e ) {
+			// We expected this, do nothing.
+		} catch ( WPAjaxDieStopException $ee ) {
+			// We expected this, do nothing.
+		}
+		ob_end_clean();
+
+		$query       = new WP_Query(
+			array(
+				'post_type'   => Visualizer_Plugin::CPT_VISUALIZER,
+				'post_status' => 'auto-draft',
+				'numberposts' => 1,
+				'fields'      => 'ids',
+				'post__not_in' => array( $this->chart ),
+			)
+		);
+
+		$new_id = $query->posts[0];
+
+		// all post meta existing in old chart should exist in new chart.
+		$old_meta = $new_meta = array();
+		$post_meta = get_post_meta( $this->chart );
+		foreach ( $post_meta as $key => $value ) {
+			if ( strpos( $key, 'visualizer-' ) !== false ) {
+				$old_meta [ $key ] = $value;
+			}
+		}
+
+		$post_meta = get_post_meta( $new_id );
+		foreach ( $post_meta as $key => $value ) {
+			if ( strpos( $key, 'visualizer-' ) !== false ) {
+				$new_meta [ $key ] = $value;
+			}
+		}
+
+		$this->assertEquals( $old_meta, $new_meta );
+	}
+
 	/**
 	 * Testing url import feature.
 	 *