test: fix failing tests due to implementation changes

swashata · Apr 26, 2021 · 3113686 · 3113686
1 parent 5123662
commit 3113686
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 74 deletions.
diff --git a/tests/data/dist/app/manifest.json b/tests/data/dist/app/manifest.json
@@ -10,34 +10,38 @@
   "runtime.js.map": "app/runtime.js.map",
   "wpackioEp": {
     "main": {
-      "js": [
-        "app/runtime.js",
-        "app/vendor.js",
-        "app/main.js"
-      ],
-      "js.map": [
-        "app/runtime.js.map",
-        "app/vendor.js.map",
-        "app/main.js.map"
-      ],
-      "css": [
-        "app/main.css"
-      ],
-      "css.map": [
-        "app/main.css.map"
-      ]
+      "assets": {
+        "js": [
+          "app/runtime.js",
+          "app/vendor.js",
+          "app/main.js"
+        ],
+        "js.map": [
+          "app/runtime.js.map",
+          "app/vendor.js.map",
+          "app/main.js.map"
+        ],
+        "css": [
+          "app/main.css"
+        ],
+        "css.map": [
+          "app/main.css.map"
+        ]
+      }
     },
     "mobile": {
-      "js": [
-        "app/runtime.js",
-        "app/vendor.js",
-        "app/mobile.js"
-      ],
-      "js.map": [
-        "app/runtime.js.map",
-        "app/vendor.js.map",
-        "app/mobile.js.map"
-      ]
+      "assets": {
+        "js": [
+          "app/runtime.js",
+          "app/vendor.js",
+          "app/mobile.js"
+        ],
+        "js.map": [
+          "app/runtime.js.map",
+          "app/vendor.js.map",
+          "app/mobile.js.map"
+        ]
+      }
     }
   }
 }
diff --git a/tests/data/dist/broken/manifest.json b/tests/data/dist/broken/manifest.json
@@ -8,26 +8,30 @@
   "mobile.js.map": "app/mobile.js.map",
   "blablabla": {
     "main": {
-      "css": [
-        "app/main.css"
-      ],
-      "js": [
-        "app/main.js"
-      ],
-      "css.map": [
-        "app/main.css.map"
-      ],
-      "js.map": [
-        "app/main.js.map"
-      ]
+      "assets": {
+        "css": [
+          "app/main.css"
+        ],
+        "js": [
+          "app/main.js"
+        ],
+        "css.map": [
+          "app/main.css.map"
+        ],
+        "js.map": [
+          "app/main.js.map"
+        ]
+      }
     },
     "mobile": {
-      "js": [
-        "app/mobile.js"
-      ],
-      "js.map": [
-        "app/mobile.js.map"
-      ]
+      "assets": {
+        "js": [
+          "app/mobile.js"
+        ],
+        "js.map": [
+          "app/mobile.js.map"
+        ]
+      }
     }
   }
 }
diff --git a/tests/testcases/EnqueueTest.php b/tests/testcases/EnqueueTest.php
@@ -365,15 +365,15 @@ public function test_register() {
 		$js_deps = [];
 		$css_deps = [];
 
-		foreach ( $manifest['wpackioEp']['main']['js'] as $js_path ) {
+		foreach ( $manifest['wpackioEp']['main']['assets']['js'] as $js_path ) {
 			$js_handle = $enqueue->getHandle( 'app', $js_path, 'script' );
 			\Brain\Monkey\Functions\expect( 'wp_register_script' )
 				->once()
 				->with( $js_handle, $this->pu . '/' . $js_path, array_merge( [ 'jquery' ], $js_deps ), '1.0.0', true );
 			$js_deps[] = $js_handle;
 		}
 		// Loop over all css and make sure wp_register_style is called
-		foreach ( $manifest['wpackioEp']['main']['css'] as $css_path ) {
+		foreach ( $manifest['wpackioEp']['main']['assets']['css'] as $css_path ) {
 			$css_handle = $enqueue->getHandle( 'app', $css_path, 'style' );
 			\Brain\Monkey\Functions\expect( 'wp_register_style' )
 				->once()

diff --git a/tests/testcases/__snapshots__/EnqueueTest__test_getManifest__1.php b/tests/testcases/__snapshots__/EnqueueTest__test_getManifest__1.php
@@ -12,40 +12,46 @@
   array (
     'main' => 
     array (
-      'js' => 
+      'assets' => 
       array (
-        0 => 'app/runtime.js',
-        1 => 'app/vendor.js',
-        2 => 'app/main.js',
-      ),
-      'js.map' => 
-      array (
-        0 => 'app/runtime.js.map',
-        1 => 'app/vendor.js.map',
-        2 => 'app/main.js.map',
-      ),
-      'css' => 
-      array (
-        0 => 'app/main.css',
-      ),
-      'css.map' => 
-      array (
-        0 => 'app/main.css.map',
+        'js' => 
+        array (
+          0 => 'app/runtime.js',
+          1 => 'app/vendor.js',
+          2 => 'app/main.js',
+        ),
+        'js.map' => 
+        array (
+          0 => 'app/runtime.js.map',
+          1 => 'app/vendor.js.map',
+          2 => 'app/main.js.map',
+        ),
+        'css' => 
+        array (
+          0 => 'app/main.css',
+        ),
+        'css.map' => 
+        array (
+          0 => 'app/main.css.map',
+        ),
       ),
     ),
     'mobile' => 
     array (
-      'js' => 
-      array (
-        0 => 'app/runtime.js',
-        1 => 'app/vendor.js',
-        2 => 'app/mobile.js',
-      ),
-      'js.map' => 
+      'assets' => 
       array (
-        0 => 'app/runtime.js.map',
-        1 => 'app/vendor.js.map',
-        2 => 'app/mobile.js.map',
+        'js' => 
+        array (
+          0 => 'app/runtime.js',
+          1 => 'app/vendor.js',
+          2 => 'app/mobile.js',
+        ),
+        'js.map' => 
+        array (
+          0 => 'app/runtime.js.map',
+          1 => 'app/vendor.js.map',
+          2 => 'app/mobile.js.map',
+        ),
       ),
     ),
   ),