fix old tests

wp-media · Jan 20, 2025 · fefa3b0 · fefa3b0
1 parent 7c13eb6
commit fefa3b0
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 34 deletions.
diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/clear.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/clear.php
@@ -7,7 +7,7 @@
 		],
         'expected' => [
 			'output' => true,
-			'path' => '/cache/background-css/'
+			'path' => '/cache/background-css/1/'
 		]
     ],
 	'notExistsShouldReturnFalse' => [
@@ -17,7 +17,7 @@
 		],
 		'expected' => [
 			'output' => true,
-			'path' => '/cache/background-css/'
+			'path' => '/cache/background-css/1/'
 		]
 	],
 

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/delete.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/delete.php
@@ -13,7 +13,7 @@
 			  ]
 		],
         'expected' => [
-			'path' => '/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/cache/background-css/1/example.org/blog/test/file.css',
 			'output' => true
 		]
     ],
@@ -30,7 +30,7 @@
 			]
 		],
 		'expected' => [
-			'path' => '/cache/background-css/example.org/blog/test',
+			'path' => '/cache/background-css/1/example.org/blog/test',
 			'output' => true
 		]
 	],
@@ -47,7 +47,7 @@
 			]
 		],
 		'expected' => [
-			'path' => '/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/cache/background-css/1/example.org/blog/test/file.css',
 			'output' => false
 		]
 	],

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/deleteMultiple.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/deleteMultiple.php
@@ -19,12 +19,12 @@
 				],
 			],
 			'is_dir' => [
-				'/cache/background-css/example.org/blog/test/file.css' => false,
-				'/cache/background-css/example.org/blog/test' => true,
+				'/cache/background-css/1/example.org/blog/test/file.css' => false,
+				'/cache/background-css/1/example.org/blog/test' => true,
 			],
 			'exists' => [
-				'/cache/background-css/example.org/blog/test/file.css' => true,
-				'/cache/background-css/example.org/blog/test' => true,
+				'/cache/background-css/1/example.org/blog/test/file.css' => true,
+				'/cache/background-css/1/example.org/blog/test' => true,
 			],
 		],
         'expected' => [
@@ -50,11 +50,11 @@
 				],
 			],
 			'is_dir' => [
-				'/cache/background-css/example.org/blog/test/file.css' => false,
+				'/cache/background-css/1/example.org/blog/test/file.css' => false,
 			],
 			'exists' => [
-				'/cache/background-css/example.org/blog/test/file.css' => true,
-				'/cache/background-css/example.org/blog/test' => false,
+				'/cache/background-css/1/example.org/blog/test/file.css' => true,
+				'/cache/background-css/1/example.org/blog/test' => false,
 			],
 		],
 		'expected' => [

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/generateUrl.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/generateUrl.php
@@ -19,8 +19,8 @@
         ],
         'expected' => [
 			'url' => 'http://example.org/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
-			'output' => 'http://example.org/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
+			'output' => 'http://example.org/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'home_url' => 'http://example.org',
 		]
     ],
@@ -43,8 +43,8 @@
 		],
 		'expected' => [
 			'url' => '/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
-			'output' => 'http://example.org/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
+			'output' => 'http://example.org/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'home_url' => 'http://example.org',
 		]
 	],
@@ -67,8 +67,8 @@
 		],
 		'expected' => [
 			'url' => 'http://example.org/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
-			'output' => 'http://example.org/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
+			'output' => 'http://example.org/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'home_url' => 'http://example.org',
 		]
 	],

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/get.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/get.php
@@ -15,7 +15,7 @@
 		],
         'expected' => [
 			'url' => 'http://example.org/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'output' => 'content'
         ]
     ],
@@ -34,7 +34,7 @@
 		],
 		'expected' => [
 			'url' => 'http://example.org/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'output' => null
 		]
 	]

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/getMultiple.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/getMultiple.php
@@ -20,11 +20,11 @@
 			'root' => '/var/html/wp-content/cache',
 			'home_url' => 'http://example.org',
 			'exists' => [
-				'/var/html/wp-content/cache/background-css/example.org/blog/test/file.css' => true,
-				'/var/html/wp-content/cache/background-css/example.org/blog/test/file2.css' => false,
+				'/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css' => true,
+				'/var/html/wp-content/cache/background-css/1/example.org/blog/test/file2.css' => false,
 			],
 			'content' => [
-				'/var/html/wp-content/cache/background-css/example.org/blog/test/file.css' => 'content'
+				'/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css' => 'content'
 			]
         ],
         'expected' => [

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/getRootPath.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/getRootPath.php
@@ -4,7 +4,7 @@
         'config' => [
 			'root' => '/var/html/wp-content/cache',
         ],
-        'expected' => '/var/html/wp-content/cache/background-css/'
+        'expected' => '/var/html/wp-content/cache/background-css/1/'
     ],
 
 ];
diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/has.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/has.php
@@ -13,7 +13,7 @@
 		],
         'expected' => [
 			'url' => 'http://example.org/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'output' => true
         ]
     ],
@@ -30,7 +30,7 @@
 		],
 		'expected' => [
 			'url' => 'http://example.org/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'output' => false
 		]
 	],

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/isAccessible.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/isAccessible.php
@@ -7,7 +7,7 @@
 			'root' => '/var/html/wp-content/cache'
         ],
         'expected' => [
-			'path' => '/var/html/wp-content/cache/background-css/',
+			'path' => '/var/html/wp-content/cache/background-css/1/',
 			'output' => false
         ]
     ],
@@ -19,7 +19,7 @@
 			'root' => '/var/html/wp-content/cache'
 		],
 		'expected' => [
-			'path' => '/var/html/wp-content/cache/background-css/',
+			'path' => '/var/html/wp-content/cache/background-css/1/',
 			'output' => true
 		]
 	],

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/set.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/set.php
@@ -17,7 +17,7 @@
         'expected' => [
 			'content' => 'content',
 			'url' => 'http://example.org/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'output' => true,
         ]
     ],
@@ -38,7 +38,7 @@
 		'expected' => [
 			'content' => 'content',
 			'url' => 'http://example.org/blog/test/file.css',
-			'path' => '/var/html/wp-content/cache/background-css/example.org/blog/test/file.css',
+			'path' => '/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css',
 			'output' => false,
 		]
 	],

diff --git a/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/setMultiple.php b/tests/Fixtures/inc/Engine/Common/Cache/FilesystemCache/setMultiple.php
@@ -21,11 +21,11 @@
 			'home_url' => 'http://example.org',
 			'root' => '/var/html/wp-content/cache',
 			'saved' => [
-				'/var/html/wp-content/cache/background-css/example.org/blog/test/file.css' => [
+				'/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css' => [
 					'content' => 'content',
 					'output' => true,
 				],
-				'/var/html/wp-content/cache/background-css/example.org/blog/test/file2.css' => [
+				'/var/html/wp-content/cache/background-css/1/example.org/blog/test/file2.css' => [
 					'content' => 'content2',
 					'output' => true,
 				],
@@ -56,11 +56,11 @@
 			'home_url' => 'http://example.org',
 			'root' => '/var/html/wp-content/cache',
 			'saved' => [
-				'/var/html/wp-content/cache/background-css/example.org/blog/test/file.css' => [
+				'/var/html/wp-content/cache/background-css/1/example.org/blog/test/file.css' => [
 					'content' => 'content',
 					'output' => true,
 				],
-				'/var/html/wp-content/cache/background-css/example.org/blog/test/file2.css' => [
+				'/var/html/wp-content/cache/background-css/1/example.org/blog/test/file2.css' => [
 					'content' => 'content2',
 					'output' => false,
 				],

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/clear.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/clear.php
@@ -29,6 +29,7 @@ public function set_up() {
 	 */
 	public function testShouldReturnAsExpected( $config, $expected ) {
 		Functions\when('rocket_get_constant')->justReturn($config['root']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 		$this->filesystem->shouldReceive('exists')->with($expected['path'])->andReturn($config['exists']);
 		$this->configureDirDelete($config, $expected);
 		$this->assertSame($expected['output'], $this->filesystemcache->clear());

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/delete.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/delete.php
@@ -29,6 +29,7 @@ public function set_up() {
 	 */
 	public function testShouldReturnAsExpected( $config, $expected ) {
 		Functions\when('rocket_get_constant')->justReturn($config['root']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 		Functions\expect('get_rocket_parse_url')->with($config['key'])->andReturn($config['parsed_url']);
 		Functions\when('home_url')->justReturn($config['home_url']);
 		$this->filesystem->shouldReceive('exists')->with($expected['path'])->andReturn($config['exists']);

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/deleteMultiple.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/deleteMultiple.php
@@ -29,6 +29,7 @@ public function set_up() {
 	 */
 	public function testShouldReturnAsExpected( $config, $expected ) {
 		Functions\when('rocket_get_constant')->justReturn($config['root']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 		Functions\when('home_url')->justReturn($config['home_url']);
 		Functions\when('get_rocket_parse_url')->alias(function ($url) use ($config) {
 			if(! key_exists($url, $config['parsed_url'])) {

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/generateUrl.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/generateUrl.php
@@ -56,6 +56,7 @@ public function testShouldReturnAsExpected( $config, $expected )
 		});
 
 		Functions\when('home_url')->justReturn($config['home_url']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 
 		Functions\when('rocket_get_constant')->alias(function ($name, $default = false) use ($config) {
 			if('WP_CONTENT_URL' === $name) {

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/get.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/get.php
@@ -31,6 +31,7 @@ public function testShouldReturnAsExpected( $config, $expected ) {
 		Functions\expect('get_rocket_parse_url')->with($expected['url'])->andReturn($config['parsed_url']);
 		Functions\when('rocket_get_constant')->justReturn($config['root']);
 		Functions\when('home_url')->justReturn($config['home_url']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 
 		$this->filesystem->shouldReceive('exists')->with($expected['path'])->andReturn($config['exists']);
 

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/getMultiple.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/getMultiple.php
@@ -35,6 +35,7 @@ public function testShouldReturnAsExpected( $config, $expected ) {
 			return $config['parsed_url'][$url];
 		});
 		Functions\when('home_url')->justReturn($config['home_url']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 
 		Functions\when('rocket_get_constant')->justReturn($config['root']);
 

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/getRootPath.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/getRootPath.php
@@ -43,6 +43,7 @@ public function set_up() {
     public function testShouldReturnAsExpected( $config, $expected )
     {
 		Functions\when('rocket_get_constant')->justReturn($config['root']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
         $this->assertSame($expected, $this->filesystemcache->get_root_path());
     }
 }
diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/has.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/has.php
@@ -31,6 +31,7 @@ public function testShouldReturnAsExpected( $config, $expected ) {
 		Functions\expect('get_rocket_parse_url')->with($expected['url'])->andReturn($config['parsed_url']);
 		Functions\when('rocket_get_constant')->justReturn($config['root']);
 		Functions\when('home_url')->justReturn($config['home_url']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 
 		$this->filesystem->shouldReceive('exists')->with($expected['path'])->andReturn($config['exists']);
 

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/isAccessible.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/isAccessible.php
@@ -30,6 +30,7 @@ public function set_up() {
 	 */
 	public function testShouldReturnAsExpected( $config, $expected ) {
 	Functions\when('rocket_get_constant')->justReturn($config['root']);
+	Functions\when('get_current_blog_id')->justReturn( 1 );
 
 	$this->filesystem->shouldReceive('exists')->with($expected['path'])->andReturn($config['exists']);
 	if( ! $config['exists']) {

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/set.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/set.php
@@ -34,6 +34,7 @@ public function testShouldReturnAsExpected( $config, $expected ) {
 	Functions\when('rocket_get_constant')->justReturn($config['root']);
 	Functions\expect('rocket_mkdir_p')->with( dirname($expected['path']), $this->filesystem );
 	Functions\when('home_url')->justReturn($config['home_url']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 
 	$this->filesystem->shouldReceive('put_contents')->with($expected['path'], $expected['content'], $config['rights'])->andReturn($config['saved']);
 

diff --git a/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/setMultiple.php b/tests/Unit/inc/Engine/Common/Cache/FilesystemCache/setMultiple.php
@@ -40,6 +40,7 @@ public function testShouldReturnAsExpected( $config, $expected ) {
 		Functions\when('rocket_mkdir_p')->justReturn();
 
 		Functions\when('rocket_get_constant')->justReturn($config['root']);
+		Functions\when('get_current_blog_id')->justReturn( 1 );
 
 		foreach ($config['saved'] as $path => $saved) {
 			$this->filesystem->shouldReceive('put_contents')->with($path, $saved['content'], $config['rights'])->andReturn($saved['output']);