Merge pull request #124 from xwp/fix/123

Fix migration notice on new WP install
xwp · Feb 27, 2017 · bf0f7f7 · bf0f7f7
2 parents bdfb0ec + 71a4ae0
commit bf0f7f7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/php/class-migrate.php b/php/class-migrate.php
@@ -50,6 +50,11 @@ public function is_migrated() {
 	 */
 	public function maybe_migrate() {
 		if ( ! $this->is_migrated() ) {
+			$found_post = $this->changeset_migrate( 1, true );
+			if ( empty( $found_post ) ) {
+				update_option( self::KEY, 1 );
+				return;
+			}
 			add_action( 'admin_notices', array( $this, 'show_migration_notice' ) );
 			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_script' ) );
 			add_action( 'wp_ajax_customize_snapshot_migration', array( $this, 'handle_migrate_changeset_request' ) );

diff --git a/tests/php/test-class-migrate.php b/tests/php/test-class-migrate.php
@@ -108,11 +108,34 @@ function test_is_migrated() {
 	 * @see Migrate::maybe_migrate()
 	 */
 	function test_maybe_migrate() {
-		$migrate = new Migrate( $this->plugin );
+		delete_option( Migrate::KEY );
+		$migrate = $this->getMockBuilder( 'CustomizeSnapshots\Migrate' )
+		                    ->setMethods( array( 'changeset_migrate' ) )
+		                    ->setConstructorArgs( array( $this->plugin ) )
+		                    ->getMock();
+		$migrate->expects( $this->once() )
+		            ->method( 'changeset_migrate' )
+					->with( 1, true )
+		            ->will( $this->returnValue( 92 ) );
 		$migrate->maybe_migrate();
 		$this->assertEquals( 10, has_action( 'admin_notices', array( $migrate, 'show_migration_notice' ) ) );
 		$this->assertEquals( 10, has_action( 'admin_enqueue_scripts', array( $migrate, 'enqueue_script' ) ) );
 		$this->assertEquals( 10, has_action( 'wp_ajax_customize_snapshot_migration', array( $migrate, 'handle_migrate_changeset_request' ) ) );
+
+		// If no post to migrate fall back and add option value.
+		$migrate_obj = $this->getMockBuilder( 'CustomizeSnapshots\Migrate' )
+		                ->setMethods( array( 'changeset_migrate' ) )
+		                ->setConstructorArgs( array( $this->plugin ) )
+		                ->getMock();
+		$migrate_obj->expects( $this->once() )
+		        ->method( 'changeset_migrate' )
+		        ->with( 1, true )
+		        ->will( $this->returnValue( false ) );
+		$migrate_obj->maybe_migrate();
+		$this->assertNotEquals( 10, has_action( 'admin_notices', array( $migrate_obj, 'show_migration_notice' ) ) );
+		$this->assertNotEquals( 10, has_action( 'admin_enqueue_scripts', array( $migrate_obj, 'enqueue_script' ) ) );
+		$this->assertNotEquals( 10, has_action( 'wp_ajax_customize_snapshot_migration', array( $migrate_obj, 'handle_migrate_changeset_request' ) ) );
+		$this->assertEquals( 1, get_option( Migrate::KEY ) );
 	}
 
 	/**

diff --git a/tests/php/test-class-snapshot-ajax.php b/tests/php/test-class-snapshot-ajax.php
@@ -41,9 +41,8 @@ function test_handle_migrate_changeset_request() {
 		                    ->setMethods( array( 'changeset_migrate' ) )
 							->setConstructorArgs( array( $this->plugin ) )
 		                    ->getMock();
-		$migrate_obj->expects( $this->once() )
+		$migrate_obj->expects( $this->any() )
 		            ->method( 'changeset_migrate' )
-					->with( 1, false )
 		            ->will( $this->returnValue( 92 ) );
 		$migrate_obj->maybe_migrate();
 		$this->set_input_vars(array(