Merge branch 'develop'

godaddy-wordpress · Apr 4, 2016 · 6b4126c · 6b4126c
2 parents 467fc6f + 90acc51
commit 6b4126c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/test-class-gem-official.php b/tests/test-class-gem-official.php
@@ -97,11 +97,11 @@ public function test_register_widget() {
 
 	public function test_enqueue() {
 		$this->instance->enqueue();
-		$this->assertContains( 'gem-main', wp_scripts()->queue );
-		$this->assertContains( 'function', wp_scripts()->queue );
-		$this->assertContains( 'jquery-ui', wp_scripts()->queue );
-		$this->assertArrayHasKey( 'gem-base', wp_styles()->registered );
-		$this->assertArrayHasKey( 'jquery-ui', wp_styles()->registered );
+		$this->assertTrue( wp_script_is( 'gem-main','queue' ) );
+		$this->assertTrue( wp_script_is( 'function', 'queue' ) );
+		$this->assertTrue( wp_script_is( 'jquery-ui', 'queue' ) );
+		$this->assertTrue( wp_style_is( 'gem-base', 'registered' ) );
+		$this->assertTrue( wp_style_is( 'jquery-ui', 'registered' ) );
 	}
 
 	public function test_action_links() {

diff --git a/tests/test-class-gem-settings.php b/tests/test-class-gem-settings.php
@@ -62,7 +62,7 @@ public function test_page_load() {
 		$instance->action_admin_menu();
 
 		$this->assertIsDefinedAction( 'in_admin_header', array( $instance, 'setup_help_tabs' ) );
-		$this->assertArrayHasKey( 'gem-admin', wp_styles()->registered );
+		$this->assertTrue( wp_style_is( 'gem-admin', 'registered' ) );
 
 		// debug-reset action:
 		$_GET['action'] = 'debug-reset';