Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Enable the new Blaze Dashboard page by default.
2 changes: 1 addition & 1 deletion projects/packages/blaze/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"link-template": "https://github.com/automattic/jetpack-blaze/compare/v${old}...v${new}"
},
"branch-alias": {
"dev-trunk": "0.8.x-dev"
"dev-trunk": "0.9.x-dev"
},
"textdomain": "jetpack-blaze",
"version-constants": {
Expand Down
2 changes: 1 addition & 1 deletion projects/packages/blaze/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-blaze",
"version": "0.8.1",
"version": "0.9.0-alpha",
"description": "Attract high-quality traffic to your site using Blaze. Using this service, you can advertise a post or page on some of the millions of pages across WordPress.com and Tumblr from just $5 per day.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/blaze/#readme",
"bugs": {
Expand Down
3 changes: 1 addition & 2 deletions projects/packages/blaze/src/class-blaze.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ public static function add_post_links_actions() {
* @return bool
*/
public static function is_dashboard_enabled() {
// Right now the dashboard is disabled by default.
$is_dashboard_enabled = false;
$is_dashboard_enabled = true;

// On WordPress.com sites, the dashboard is not needed.
if ( ( new Host() )->is_wpcom_platform() ) {
Expand Down
2 changes: 1 addition & 1 deletion projects/packages/blaze/src/class-dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Dashboard {
*
* @var string
*/
const PACKAGE_VERSION = '0.8.1';
const PACKAGE_VERSION = '0.9.0-alpha';

/**
* List of dependencies needed to render the dashboard in wp-admin.
Expand Down
13 changes: 2 additions & 11 deletions projects/packages/blaze/tests/php/test-blaze.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ public function test_should_not_check_eligibility_by_default() {
* @covers Automattic\Jetpack\Blaze::is_dashboard_enabled
*/
public function test_dashboard_filter_enable() {
$this->assertFalse( Blaze::is_dashboard_enabled() );
add_filter( 'jetpack_blaze_dashboard_enable', '__return_true' );
$this->assertTrue( Blaze::is_dashboard_enabled() );
add_filter( 'jetpack_blaze_dashboard_enable', '__return_false' );
$this->assertFalse( Blaze::is_dashboard_enabled() );
add_filter( 'jetpack_blaze_dashboard_enable', '__return_true' );
}

/**
Expand Down Expand Up @@ -152,18 +152,9 @@ public function test_admin_menu_added() {

add_filter( 'jetpack_blaze_enabled', '__return_true' );

// Test that no menu is added until the feature filter is enabled.
Blaze::enable_blaze_menu();

$this->assertEmpty( menu_page_url( 'advertising' ) );

// Enable the Dashboard.
add_filter( 'jetpack_blaze_dashboard_enable', '__return_true' );

Blaze::enable_blaze_menu();
$this->assertNotEmpty( menu_page_url( 'advertising' ) );

add_filter( 'jetpack_blaze_dashboard_enable', '__return_false' );
add_filter( 'jetpack_blaze_enabled', '__return_false' );
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: other
Comment: Updated composer.lock.


4 changes: 2 additions & 2 deletions projects/plugins/jetpack/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.