diff --git a/composer.json b/composer.json index 25592c97d18..11797f211fd 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "maxmind-db/reader": "1.6.0", "woocommerce/woocommerce-blocks": "2.5.10", "woocommerce/woocommerce-rest-api": "1.0.6", - "woocommerce/woocommerce-admin": "dev-try/downgrade-autoloader as 0.24.0" + "woocommerce/woocommerce-admin": "dev-try/puppeteer-test-run-in-core as 0.24.0" }, "repositories": [ { diff --git a/composer.lock b/composer.lock index 4e013424619..9482852cae8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b7c9162cd3963d03fcf3e6fcc7128a05", + "content-hash": "6a010cc860fd028c536b5c95215a6b15", "packages": [ { "name": "automattic/jetpack-autoloader", @@ -226,11 +226,11 @@ }, { "name": "woocommerce/woocommerce-admin", - "version": "dev-try/downgrade-autoloader", + "version": "dev-try/puppeteer-test-run-in-core", "source": { "type": "git", "url": "https://github.com/woocommerce/woocommerce-admin.git", - "reference": "26ee4d87d772d250a760453f0b422e300fb3abdc" + "reference": "633a6f6541e2a490e614baceb16935e9f680cece" }, "require": { "automattic/jetpack-autoloader": "^1.2.0", @@ -273,7 +273,7 @@ ], "description": "A modern, javascript-driven WooCommerce Admin experience.", "homepage": "https://github.com/woocommerce/woocommerce-admin", - "time": "2020-01-20T19:08:51+00:00" + "time": "2020-01-23T17:16:52+00:00" }, { "name": "woocommerce/woocommerce-blocks", @@ -488,16 +488,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.9.4", + "version": "1.9.5", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "579bb7356d91f9456ccd505f24ca8b667966a0a7" + "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/579bb7356d91f9456ccd505f24ca8b667966a0a7", - "reference": "579bb7356d91f9456ccd505f24ca8b667966a0a7", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef", + "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef", "shasum": "" }, "require": { @@ -532,7 +532,7 @@ "object", "object graph" ], - "time": "2019-12-15T19:12:40+00:00" + "time": "2020-01-17T21:11:47+00:00" }, { "name": "phar-io/manifest", @@ -949,24 +949,24 @@ }, { "name": "phpspec/prophecy", - "version": "1.10.1", + "version": "v1.10.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc" + "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/cbe1df668b3fe136bcc909126a0f529a78d4cbbc", - "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9", + "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.2.3|^2.0|^3.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" }, "require-dev": { "phpspec/phpspec": "^2.5 || ^3.2", @@ -1008,7 +1008,7 @@ "spy", "stub" ], - "time": "2019-12-22T21:05:45+00:00" + "time": "2020-01-20T15:57:02+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2199,7 +2199,7 @@ { "alias": "0.24.0", "alias_normalized": "0.24.0.0", - "version": "dev-try/downgrade-autoloader", + "version": "dev-try/puppeteer-test-run-in-core", "package": "woocommerce/woocommerce-admin" } ], diff --git a/tests/e2e-tests/config/jest.config.js b/tests/e2e-tests/config/jest.config.js index 4c9ac0e9ec3..de75f455e97 100644 --- a/tests/e2e-tests/config/jest.config.js +++ b/tests/e2e-tests/config/jest.config.js @@ -15,7 +15,10 @@ module.exports = { preset: 'jest-puppeteer', // Where to look for test files - roots: [ '/tests/e2e-tests/specs' ], + roots: [ + '/tests/e2e-tests/specs', + '/packages/woocommerce-admin/tests/e2e-tests/specs', + ], //setupFiles: [ '/.node_modules/regenerator-runtime/runtime' ],