test: Upgrade to new runServerless version

tlloyd-synalogik · Apr 9, 2021 · 2d1b56b · 2d1b56b
1 parent 6dd3996
commit 2d1b56b
Show file tree

Hide file tree

Showing 237 changed files with 633 additions and 465 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,5 +1,6 @@
 /.nyc_output
 /coverage
-/test/fixtures/configSyntaxError/serverless.yml
+/test/fixtures/cli/configSyntaxError/serverless.yml
 /test/unit/lib/configuration/variables/sources/fixture/invalid.json
 /test/unit/lib/configuration/variables/sources/fixture/invalid.yml
+!/test/fixtures/programmatic/locallyInstalledServerless/node_modules/**
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.1",
     "@serverless/eslint-config": "^3.0.0",
-    "@serverless/test": "^7.11.0",
+    "@serverless/test": "^8.0.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.13",
@@ -121,7 +121,8 @@
   "eslintIgnore": [
     "!/.github",
     "/lib/plugins/create/templates/**",
-    "/lib/plugins/aws/customResources/node_modules/**"
+    "/lib/plugins/aws/customResources/node_modules/**",
+    "!/test/fixtures/programmatic/locallyInstalledServerless/node_modules/**"
   ],
   "mocha": {
     "require": [

diff --git a/...fixtures/configSyntaxError/serverless.yml → ...ures/cli/configSyntaxError/serverless.yml b/...fixtures/configSyntaxError/serverless.yml → ...ures/cli/configSyntaxError/serverless.yml
diff --git a/test/fixtures/configTypeJs/serverless.js → test/fixtures/cli/configTypeJs/serverless.js b/test/fixtures/configTypeJs/serverless.js → test/fixtures/cli/configTypeJs/serverless.js
diff --git a/...xtures/configTypeJsDeferred/serverless.js → ...es/cli/configTypeJsDeferred/serverless.js b/...xtures/configTypeJsDeferred/serverless.js → ...es/cli/configTypeJsDeferred/serverless.js
diff --git a/test/fixtures/configTypeJson/serverless.json → ...xtures/cli/configTypeJson/serverless.json b/test/fixtures/configTypeJson/serverless.json → ...xtures/cli/configTypeJson/serverless.json
diff --git a/...tures/configTypeNonObject/serverless.json → ...s/cli/configTypeNonObject/serverless.json b/...tures/configTypeNonObject/serverless.json → ...s/cli/configTypeNonObject/serverless.json
diff --git a/test/fixtures/configTypeYaml/serverless.yaml → ...xtures/cli/configTypeYaml/serverless.yaml b/test/fixtures/configTypeYaml/serverless.yaml → ...xtures/cli/configTypeYaml/serverless.yaml
diff --git a/test/fixtures/configTypeYml/serverless.yml → ...fixtures/cli/configTypeYml/serverless.yml b/test/fixtures/configTypeYml/serverless.yml → ...fixtures/cli/configTypeYml/serverless.yml
diff --git a/...ures/configTypeYmlAndJson/serverless.json → .../cli/configTypeYmlAndJson/serverless.json b/...ures/configTypeYmlAndJson/serverless.json → .../cli/configTypeYmlAndJson/serverless.json
diff --git a/...tures/configTypeYmlAndJson/serverless.yml → ...s/cli/configTypeYmlAndJson/serverless.yml b/...tures/configTypeYmlAndJson/serverless.yml → ...s/cli/configTypeYmlAndJson/serverless.yml
diff --git a/test/fixtures/index.js → test/fixtures/cli/index.js b/test/fixtures/index.js → test/fixtures/cli/index.js
diff --git a/test/fixtures/serverlessTs/serverless.ts → test/fixtures/cli/serverlessTs/serverless.ts b/test/fixtures/serverlessTs/serverless.ts → test/fixtures/cli/serverlessTs/serverless.ts
diff --git a/test/fixtures/uncaughtException/plugin.js → .../fixtures/cli/uncaughtException/plugin.js b/test/fixtures/uncaughtException/plugin.js → .../fixtures/cli/uncaughtException/plugin.js
diff --git a/test/fixtures/exception/serverless.yml → ...ures/cli/uncaughtException/serverless.yml b/test/fixtures/exception/serverless.yml → ...ures/cli/uncaughtException/serverless.yml
diff --git a/test/fixtures/variables-legacy/config.json → test/fixtures/cli/variables/config.json b/test/fixtures/variables-legacy/config.json → test/fixtures/cli/variables/config.json
diff --git a/test/fixtures/variables/serverless.yml → test/fixtures/cli/variables/serverless.yml b/test/fixtures/variables/serverless.yml → test/fixtures/cli/variables/serverless.yml
diff --git a/...xtures/variables-legacy/terraform.tfstate → .../fixtures/cli/variables/terraform.tfstate b/...xtures/variables-legacy/terraform.tfstate → .../fixtures/cli/variables/terraform.tfstate
diff --git a/test/fixtures/apiGateway/index.js → ...fixtures/programmatic/apiGateway/index.js b/test/fixtures/apiGateway/index.js → ...fixtures/programmatic/apiGateway/index.js
diff --git a/test/fixtures/apiGateway/serverless.yml → ...es/programmatic/apiGateway/serverless.yml b/test/fixtures/apiGateway/serverless.yml → ...es/programmatic/apiGateway/serverless.yml
diff --git a/test/fixtures/apiGatewayExtended/core.js → ...s/programmatic/apiGatewayExtended/core.js b/test/fixtures/apiGatewayExtended/core.js → ...s/programmatic/apiGatewayExtended/core.js
diff --git a/test/fixtures/apiGatewayExtended/helper.js → ...programmatic/apiGatewayExtended/helper.js b/test/fixtures/apiGatewayExtended/helper.js → ...programmatic/apiGatewayExtended/helper.js
diff --git a/...ixtures/apiGatewayExtended/serverless.yml → ...ammatic/apiGatewayExtended/serverless.yml b/...ixtures/apiGatewayExtended/serverless.yml → ...ammatic/apiGatewayExtended/serverless.yml
diff --git a/test/fixtures/aws/serverless.yml → .../fixtures/programmatic/aws/serverless.yml b/test/fixtures/aws/serverless.yml → .../fixtures/programmatic/aws/serverless.yml
diff --git a/test/fixtures/programmatic/blank/serverless.yml b/test/fixtures/programmatic/blank/serverless.yml
@@ -0,0 +1 @@
+{}
diff --git a/test/fixtures/checkForChanges/artifact.zip → ...programmatic/checkForChanges/artifact.zip b/test/fixtures/checkForChanges/artifact.zip → ...programmatic/checkForChanges/artifact.zip
diff --git a/test/fixtures/checkForChanges/fn.js → ...xtures/programmatic/checkForChanges/fn.js b/test/fixtures/checkForChanges/fn.js → ...xtures/programmatic/checkForChanges/fn.js
diff --git a/...ixtures/checkForChanges/fnIndividually.js → ...ammatic/checkForChanges/fnIndividually.js b/...ixtures/checkForChanges/fnIndividually.js → ...ammatic/checkForChanges/fnIndividually.js
diff --git a/test/fixtures/checkForChanges/serverless.yml → ...ogrammatic/checkForChanges/serverless.yml b/test/fixtures/checkForChanges/serverless.yml → ...ogrammatic/checkForChanges/serverless.yml
diff --git a/test/fixtures/cognitoUserPool/core.js → ...ures/programmatic/cognitoUserPool/core.js b/test/fixtures/cognitoUserPool/core.js → ...ures/programmatic/cognitoUserPool/core.js
diff --git a/test/fixtures/cognitoUserPool/serverless.yml → ...ogrammatic/cognitoUserPool/serverless.yml b/test/fixtures/cognitoUserPool/serverless.yml → ...ogrammatic/cognitoUserPool/serverless.yml
diff --git a/test/fixtures/cognitoUserPool/utils.js → ...res/programmatic/cognitoUserPool/utils.js b/test/fixtures/cognitoUserPool/utils.js → ...res/programmatic/cognitoUserPool/utils.js
diff --git a/test/fixtures/configInvalid/serverless.yml → ...programmatic/configInvalid/serverless.yml b/test/fixtures/configInvalid/serverless.yml → ...programmatic/configInvalid/serverless.yml
diff --git a/...res/configSchemaExtensions/serverless.yml → ...tic/configSchemaExtensions/serverless.yml b/...res/configSchemaExtensions/serverless.yml → ...tic/configSchemaExtensions/serverless.yml
diff --git a/...res/configSchemaExtensions/test-plugin.js → ...tic/configSchemaExtensions/test-plugin.js b/...res/configSchemaExtensions/test-plugin.js → ...tic/configSchemaExtensions/test-plugin.js
diff --git a/...onfigSchemaExtensionsError/serverless.yml → ...onfigSchemaExtensionsError/serverless.yml b/...onfigSchemaExtensionsError/serverless.yml → ...onfigSchemaExtensionsError/serverless.yml
diff --git a/...-plugin-with-colliding-custom-property.js → ...-plugin-with-colliding-custom-property.js b/...-plugin-with-colliding-custom-property.js → ...-plugin-with-colliding-custom-property.js
diff --git a/...with-colliding-function-event-property.js → ...with-colliding-function-event-property.js b/...with-colliding-function-event-property.js → ...with-colliding-function-event-property.js
diff --git a/...t-plugin-with-colliding-function-event.js → ...t-plugin-with-colliding-function-event.js b/...t-plugin-with-colliding-function-event.js → ...t-plugin-with-colliding-function-event.js
diff --git a/...lugin-with-colliding-function-property.js → ...lugin-with-colliding-function-property.js b/...lugin-with-colliding-function-property.js → ...lugin-with-colliding-function-property.js
diff --git a/...olliding-provider-property-in-function.js → ...olliding-provider-property-in-function.js b/...olliding-provider-property-in-function.js → ...olliding-provider-property-in-function.js
diff --git a/...olliding-provider-property-in-provider.js → ...olliding-provider-property-in-provider.js b/...olliding-provider-property-in-provider.js → ...olliding-provider-property-in-provider.js
diff --git a/...ugin-with-colliding-top-level-property.js → ...ugin-with-colliding-top-level-property.js b/...ugin-with-colliding-top-level-property.js → ...ugin-with-colliding-top-level-property.js
diff --git a/...omplex-event-without-object-definition.js → ...omplex-event-without-object-definition.js b/...omplex-event-without-object-definition.js → ...omplex-event-without-object-definition.js
diff --git a/...t-plugin-with-non-existing-event-error.js → ...t-plugin-with-non-existing-event-error.js b/...t-plugin-with-non-existing-event-error.js → ...t-plugin-with-non-existing-event-error.js
diff --git a/...fixtures/customProvider/customProvider.js → ...rammatic/customProvider/customProvider.js b/...fixtures/customProvider/customProvider.js → ...rammatic/customProvider/customProvider.js
diff --git a/test/fixtures/customProvider/serverless.yml → ...rogrammatic/customProvider/serverless.yml b/test/fixtures/customProvider/serverless.yml → ...rogrammatic/customProvider/serverless.yml
diff --git a/test/fixtures/ecr/Dockerfile → test/fixtures/programmatic/ecr/Dockerfile b/test/fixtures/ecr/Dockerfile → test/fixtures/programmatic/ecr/Dockerfile
diff --git a/test/fixtures/ecr/Dockerfile.dev → .../fixtures/programmatic/ecr/Dockerfile.dev b/test/fixtures/ecr/Dockerfile.dev → .../fixtures/programmatic/ecr/Dockerfile.dev
diff --git a/test/fixtures/ecr/app.js → test/fixtures/programmatic/ecr/app.js b/test/fixtures/ecr/app.js → test/fixtures/programmatic/ecr/app.js
diff --git a/test/fixtures/ecr/serverless.yml → .../fixtures/programmatic/ecr/serverless.yml b/test/fixtures/ecr/serverless.yml → .../fixtures/programmatic/ecr/serverless.yml
diff --git a/test/fixtures/eventBridge/core.js → ...fixtures/programmatic/eventBridge/core.js b/test/fixtures/eventBridge/core.js → ...fixtures/programmatic/eventBridge/core.js
diff --git a/test/fixtures/eventBridge/serverless.yml → ...s/programmatic/eventBridge/serverless.yml b/test/fixtures/eventBridge/serverless.yml → ...s/programmatic/eventBridge/serverless.yml
diff --git a/test/fixtures/eventBridge/utils.js → ...ixtures/programmatic/eventBridge/utils.js b/test/fixtures/eventBridge/utils.js → ...ixtures/programmatic/eventBridge/utils.js
diff --git a/test/fixtures/exception/plugin.js → ...fixtures/programmatic/exception/plugin.js b/test/fixtures/exception/plugin.js → ...fixtures/programmatic/exception/plugin.js
diff --git a/...fixtures/uncaughtException/serverless.yml → ...res/programmatic/exception/serverless.yml b/...fixtures/uncaughtException/serverless.yml → ...res/programmatic/exception/serverless.yml
diff --git a/test/fixtures/function/index.js → test/fixtures/programmatic/function/index.js b/test/fixtures/function/index.js → test/fixtures/programmatic/function/index.js
diff --git a/test/fixtures/function/serverless.yml → ...ures/programmatic/function/serverless.yml b/test/fixtures/function/serverless.yml → ...ures/programmatic/function/serverless.yml
diff --git a/test/fixtures/functionCloudFront/index.js → .../programmatic/functionCloudFront/index.js b/test/fixtures/functionCloudFront/index.js → .../programmatic/functionCloudFront/index.js
diff --git a/...ixtures/functionCloudFront/serverless.yml → ...ammatic/functionCloudFront/serverless.yml b/...ixtures/functionCloudFront/serverless.yml → ...ammatic/functionCloudFront/serverless.yml
diff --git a/...tures/functionDestinations/serverless.yml → ...matic/functionDestinations/serverless.yml b/...tures/functionDestinations/serverless.yml → ...matic/functionDestinations/serverless.yml
diff --git a/test/fixtures/functionDestinations/target.js → ...ogrammatic/functionDestinations/target.js b/test/fixtures/functionDestinations/target.js → ...ogrammatic/functionDestinations/target.js
diff --git a/.../fixtures/functionDestinations/trigger.js → ...grammatic/functionDestinations/trigger.js b/.../fixtures/functionDestinations/trigger.js → ...grammatic/functionDestinations/trigger.js
diff --git a/test/fixtures/functionEfs/core.js → ...fixtures/programmatic/functionEfs/core.js b/test/fixtures/functionEfs/core.js → ...fixtures/programmatic/functionEfs/core.js
diff --git a/test/fixtures/functionEfs/serverless.yml → ...s/programmatic/functionEfs/serverless.yml b/test/fixtures/functionEfs/serverless.yml → ...s/programmatic/functionEfs/serverless.yml
diff --git a/...tra_layers/testLayerSourceChange/index.js → ...tra_layers/testLayerSourceChange/index.js b/...tra_layers/testLayerSourceChange/index.js → ...tra_layers/testLayerSourceChange/index.js
diff --git a/test/fixtures/functionLayers/index.js → ...ures/programmatic/functionLayers/index.js b/test/fixtures/functionLayers/index.js → ...ures/programmatic/functionLayers/index.js
diff --git a/test/fixtures/functionLayers/serverless.yml → ...rogrammatic/functionLayers/serverless.yml b/test/fixtures/functionLayers/serverless.yml → ...rogrammatic/functionLayers/serverless.yml
diff --git a/...ixtures/functionLayers/testLayer/index.js → ...ammatic/functionLayers/testLayer/index.js b/...ixtures/functionLayers/testLayer/index.js → ...ammatic/functionLayers/testLayer/index.js
diff --git a/test/fixtures/functionMsk/core.js → ...fixtures/programmatic/functionMsk/core.js b/test/fixtures/functionMsk/core.js → ...fixtures/programmatic/functionMsk/core.js
diff --git a/test/fixtures/functionMsk/package.json → ...res/programmatic/functionMsk/package.json b/test/fixtures/functionMsk/package.json → ...res/programmatic/functionMsk/package.json
diff --git a/test/fixtures/functionMsk/serverless.yml → ...s/programmatic/functionMsk/serverless.yml b/test/fixtures/functionMsk/serverless.yml → ...s/programmatic/functionMsk/serverless.yml
diff --git a/test/fixtures/httpApi/authorizers.js → ...tures/programmatic/httpApi/authorizers.js b/test/fixtures/httpApi/authorizers.js → ...tures/programmatic/httpApi/authorizers.js
diff --git a/test/fixtures/httpApi/index.js → test/fixtures/programmatic/httpApi/index.js b/test/fixtures/httpApi/index.js → test/fixtures/programmatic/httpApi/index.js
diff --git a/test/fixtures/httpApi/serverless.yml → ...tures/programmatic/httpApi/serverless.yml b/test/fixtures/httpApi/serverless.yml → ...tures/programmatic/httpApi/serverless.yml
diff --git a/test/fixtures/httpApiCatchAll/index.js → ...res/programmatic/httpApiCatchAll/index.js b/test/fixtures/httpApiCatchAll/index.js → ...res/programmatic/httpApiCatchAll/index.js
diff --git a/test/fixtures/httpApiCatchAll/serverless.yml → ...ogrammatic/httpApiCatchAll/serverless.yml b/test/fixtures/httpApiCatchAll/serverless.yml → ...ogrammatic/httpApiCatchAll/serverless.yml
diff --git a/test/fixtures/httpApiExport/serverless.yml → ...programmatic/httpApiExport/serverless.yml b/test/fixtures/httpApiExport/serverless.yml → ...programmatic/httpApiExport/serverless.yml
diff --git a/test/fixtures/programmatic/index.js b/test/fixtures/programmatic/index.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('@serverless/test/setup-fixtures-engine')(__dirname);
diff --git a/test/fixtures/invocation/async.js → ...fixtures/programmatic/invocation/async.js b/test/fixtures/invocation/async.js → ...fixtures/programmatic/invocation/async.js
diff --git a/test/fixtures/invocation/callback.js → ...tures/programmatic/invocation/callback.js b/test/fixtures/invocation/callback.js → ...tures/programmatic/invocation/callback.js
diff --git a/test/fixtures/invocation/context-done.js → ...s/programmatic/invocation/context-done.js b/test/fixtures/invocation/context-done.js → ...s/programmatic/invocation/context-done.js
diff --git a/test/fixtures/invocation/context-succeed.js → ...rogrammatic/invocation/context-succeed.js b/test/fixtures/invocation/context-succeed.js → ...rogrammatic/invocation/context-succeed.js
diff --git a/test/fixtures/invocation/context.json → ...ures/programmatic/invocation/context.json b/test/fixtures/invocation/context.json → ...ures/programmatic/invocation/context.json
diff --git a/...tion/doubled-resolution-callback-first.js → ...tion/doubled-resolution-callback-first.js b/...tion/doubled-resolution-callback-first.js → ...tion/doubled-resolution-callback-first.js
diff --git a/...ation/doubled-resolution-promise-first.js → ...ation/doubled-resolution-promise-first.js b/...ation/doubled-resolution-promise-first.js → ...ation/doubled-resolution-promise-first.js
diff --git a/test/fixtures/invocation/init-fail.js → ...ures/programmatic/invocation/init-fail.js b/test/fixtures/invocation/init-fail.js → ...ures/programmatic/invocation/init-fail.js
diff --git a/test/fixtures/invocation/invocation-fail.js → ...rogrammatic/invocation/invocation-fail.js b/test/fixtures/invocation/invocation-fail.js → ...rogrammatic/invocation/invocation-fail.js
diff --git a/test/fixtures/invocation/payload.js → ...xtures/programmatic/invocation/payload.js b/test/fixtures/invocation/payload.js → ...xtures/programmatic/invocation/payload.js
diff --git a/test/fixtures/invocation/payload.json → ...ures/programmatic/invocation/payload.json b/test/fixtures/invocation/payload.json → ...ures/programmatic/invocation/payload.json
diff --git a/test/fixtures/invocation/payload.yaml → ...ures/programmatic/invocation/payload.yaml b/test/fixtures/invocation/payload.yaml → ...ures/programmatic/invocation/payload.yaml
diff --git a/test/fixtures/invocation/remaining-time.js → ...programmatic/invocation/remaining-time.js b/test/fixtures/invocation/remaining-time.js → ...programmatic/invocation/remaining-time.js
diff --git a/test/fixtures/invocation/serverless.yml → ...es/programmatic/invocation/serverless.yml b/test/fixtures/invocation/serverless.yml → ...es/programmatic/invocation/serverless.yml
diff --git a/test/fixtures/iot/core.js → test/fixtures/programmatic/iot/core.js b/test/fixtures/iot/core.js → test/fixtures/programmatic/iot/core.js
diff --git a/test/fixtures/iot/serverless.yml → .../fixtures/programmatic/iot/serverless.yml b/test/fixtures/iot/serverless.yml → .../fixtures/programmatic/iot/serverless.yml
diff --git a/test/fixtures/iot/utils.js → test/fixtures/programmatic/iot/utils.js b/test/fixtures/iot/utils.js → test/fixtures/programmatic/iot/utils.js
diff --git a/test/fixtures/iotFleetProvisioning/hook.js → ...programmatic/iotFleetProvisioning/hook.js b/test/fixtures/iotFleetProvisioning/hook.js → ...programmatic/iotFleetProvisioning/hook.js
diff --git a/...ixtures/iotFleetProvisioning/package.json → ...ammatic/iotFleetProvisioning/package.json b/...ixtures/iotFleetProvisioning/package.json → ...ammatic/iotFleetProvisioning/package.json
diff --git a/...es/iotFleetProvisioning/registerDevice.js → ...ic/iotFleetProvisioning/registerDevice.js b/...es/iotFleetProvisioning/registerDevice.js → ...ic/iotFleetProvisioning/registerDevice.js
diff --git a/...tures/iotFleetProvisioning/serverless.yml → ...matic/iotFleetProvisioning/serverless.yml b/...tures/iotFleetProvisioning/serverless.yml → ...matic/iotFleetProvisioning/serverless.yml
diff --git a/...xtures/iotFleetProvisioning/template.json → ...mmatic/iotFleetProvisioning/template.json b/...xtures/iotFleetProvisioning/template.json → ...mmatic/iotFleetProvisioning/template.json
diff --git a/test/fixtures/layer/index.js → test/fixtures/programmatic/layer/index.js b/test/fixtures/layer/index.js → test/fixtures/programmatic/layer/index.js
diff --git a/test/fixtures/layer/layer/index.js → ...ixtures/programmatic/layer/layer/index.js b/test/fixtures/layer/layer/index.js → ...ixtures/programmatic/layer/layer/index.js
diff --git a/test/fixtures/layer/serverless.yml → ...ixtures/programmatic/layer/serverless.yml b/test/fixtures/layer/serverless.yml → ...ixtures/programmatic/layer/serverless.yml
diff --git a/...ures/locallyInstalledServerless/_setup.js → ...atic/locallyInstalledServerless/_setup.js b/...ures/locallyInstalledServerless/_setup.js → ...atic/locallyInstalledServerless/_setup.js
@@ -12,7 +12,7 @@ module.exports = (originalFixturePath) => {
     fixtureModulePath,
     String(content).replace(
       '$SERVERLESS_PATH',
-      JSON.stringify(path.resolve(originalFixturePath, '../../../'))
+      JSON.stringify(path.resolve(originalFixturePath, '../../../../'))
     )
   );
 };
diff --git a/...rverless/node_modules/serverless/index.js → ...rverless/node_modules/serverless/index.js b/...rverless/node_modules/serverless/index.js → ...rverless/node_modules/serverless/index.js
diff --git a/...rogrammatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js b/...rogrammatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js
diff --git a/.../locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js b/.../locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js
diff --git a/.../programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js b/.../programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js
diff --git a/...programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js b/...programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js
diff --git a/...ammatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js b/...ammatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js
diff --git a/...erless/lib/utils/analytics/areDisabled.js → ...erless/lib/utils/analytics/areDisabled.js b/...erless/lib/utils/analytics/areDisabled.js → ...erless/lib/utils/analytics/areDisabled.js
diff --git a/...locallyInstalledServerless/serverless.yml → ...locallyInstalledServerless/serverless.yml b/...locallyInstalledServerless/serverless.yml → ...locallyInstalledServerless/serverless.yml
diff --git a/...ures/packageArtifact/absoluteArtifact.zip → ...atic/packageArtifact/absoluteArtifact.zip b/...ures/packageArtifact/absoluteArtifact.zip → ...atic/packageArtifact/absoluteArtifact.zip
diff --git a/...res/packageArtifact/artifact-function.zip → ...tic/packageArtifact/artifact-function.zip b/...res/packageArtifact/artifact-function.zip → ...tic/packageArtifact/artifact-function.zip
diff --git a/test/fixtures/packageArtifact/artifact.zip → ...programmatic/packageArtifact/artifact.zip b/test/fixtures/packageArtifact/artifact.zip → ...programmatic/packageArtifact/artifact.zip
diff --git a/test/fixtures/packageArtifact/index.js → ...res/programmatic/packageArtifact/index.js b/test/fixtures/packageArtifact/index.js → ...res/programmatic/packageArtifact/index.js
diff --git a/test/fixtures/packageArtifact/serverless.yml → ...ogrammatic/packageArtifact/serverless.yml b/test/fixtures/packageArtifact/serverless.yml → ...ogrammatic/packageArtifact/serverless.yml
diff --git a/...packageArtifactInServerlessDir/my-own.zip → ...packageArtifactInServerlessDir/my-own.zip b/...packageArtifactInServerlessDir/my-own.zip → ...packageArtifactInServerlessDir/my-own.zip
diff --git a/...nServerlessDir/package-artifact-plugin.js → ...nServerlessDir/package-artifact-plugin.js b/...nServerlessDir/package-artifact-plugin.js → ...nServerlessDir/package-artifact-plugin.js
diff --git a/...ageArtifactInServerlessDir/serverless.yml → ...ageArtifactInServerlessDir/serverless.yml b/...ageArtifactInServerlessDir/serverless.yml → ...ageArtifactInServerlessDir/serverless.yml
diff --git a/test/fixtures/packaging/.env → test/fixtures/programmatic/packaging/.env b/test/fixtures/packaging/.env → test/fixtures/programmatic/packaging/.env
diff --git a/test/fixtures/packaging/.env.stage → ...ixtures/programmatic/packaging/.env.stage b/test/fixtures/packaging/.env.stage → ...ixtures/programmatic/packaging/.env.stage
diff --git a/test/fixtures/packaging/.gitignore → ...ixtures/programmatic/packaging/.gitignore b/test/fixtures/packaging/.gitignore → ...ixtures/programmatic/packaging/.gitignore
diff --git a/...es/packaging/.serverless_plugins/index.js → ...ic/packaging/.serverless_plugins/index.js b/...es/packaging/.serverless_plugins/index.js → ...ic/packaging/.serverless_plugins/index.js
diff --git a/.../fixtures/packaging/artifact-function.zip → ...grammatic/packaging/artifact-function.zip b/.../fixtures/packaging/artifact-function.zip → ...grammatic/packaging/artifact-function.zip
diff --git a/test/fixtures/packaging/artifact.zip → ...tures/programmatic/packaging/artifact.zip b/test/fixtures/packaging/artifact.zip → ...tures/programmatic/packaging/artifact.zip
diff --git a/...ixtures/packaging/custom-plugins/index.js → ...ammatic/packaging/custom-plugins/index.js b/...ixtures/packaging/custom-plugins/index.js → ...ammatic/packaging/custom-plugins/index.js
diff --git a/test/fixtures/packaging/dir1/index.js → ...ures/programmatic/packaging/dir1/index.js b/test/fixtures/packaging/dir1/index.js → ...ures/programmatic/packaging/dir1/index.js
diff --git a/.../fixtures/packaging/dir1/subdir1/index.js → ...grammatic/packaging/dir1/subdir1/index.js b/.../fixtures/packaging/dir1/subdir1/index.js → ...grammatic/packaging/dir1/subdir1/index.js
diff --git a/.../fixtures/packaging/dir1/subdir2/index.js → ...grammatic/packaging/dir1/subdir2/index.js b/.../fixtures/packaging/dir1/subdir2/index.js → ...grammatic/packaging/dir1/subdir2/index.js
diff --git a/...ackaging/dir1/subdir2/subsubdir1/index.js → ...ackaging/dir1/subdir2/subsubdir1/index.js b/...ackaging/dir1/subdir2/subsubdir1/index.js → ...ackaging/dir1/subdir2/subsubdir1/index.js
diff --git a/...ackaging/dir1/subdir2/subsubdir2/index.js → ...ackaging/dir1/subdir2/subsubdir2/index.js b/...ackaging/dir1/subdir2/subsubdir2/index.js → ...ackaging/dir1/subdir2/subsubdir2/index.js
diff --git a/...ackaging/dir1/subdir2/subsubdir3/index.js → ...ackaging/dir1/subdir2/subsubdir3/index.js b/...ackaging/dir1/subdir2/subsubdir3/index.js → ...ackaging/dir1/subdir2/subsubdir3/index.js
diff --git a/.../fixtures/packaging/dir1/subdir3/index.js → ...grammatic/packaging/dir1/subdir3/index.js b/.../fixtures/packaging/dir1/subdir3/index.js → ...grammatic/packaging/dir1/subdir3/index.js
diff --git a/.../fixtures/packaging/dir1/subdir4/index.js → ...grammatic/packaging/dir1/subdir4/index.js b/.../fixtures/packaging/dir1/subdir4/index.js → ...grammatic/packaging/dir1/subdir4/index.js
diff --git a/test/fixtures/packaging/dir2/index.js → ...ures/programmatic/packaging/dir2/index.js b/test/fixtures/packaging/dir2/index.js → ...ures/programmatic/packaging/dir2/index.js
diff --git a/test/fixtures/packaging/dir3/index.js → ...ures/programmatic/packaging/dir3/index.js b/test/fixtures/packaging/dir3/index.js → ...ures/programmatic/packaging/dir3/index.js
diff --git a/test/fixtures/packaging/index.js → .../fixtures/programmatic/packaging/index.js b/test/fixtures/packaging/index.js → .../fixtures/programmatic/packaging/index.js
diff --git a/...ixtures/packaging/layer/layer-module-1.js → ...ammatic/packaging/layer/layer-module-1.js b/...ixtures/packaging/layer/layer-module-1.js → ...ammatic/packaging/layer/layer-module-1.js
diff --git a/...ixtures/packaging/layer/layer-module-2.js → ...ammatic/packaging/layer/layer-module-2.js b/...ixtures/packaging/layer/layer-module-2.js → ...ammatic/packaging/layer/layer-module-2.js
diff --git a/test/fixtures/packaging/main.go → test/fixtures/programmatic/packaging/main.go b/test/fixtures/packaging/main.go → test/fixtures/programmatic/packaging/main.go
diff --git a/test/fixtures/packaging/serverless.yml → ...res/programmatic/packaging/serverless.yml b/test/fixtures/packaging/serverless.yml → ...res/programmatic/packaging/serverless.yml
diff --git a/test/fixtures/plugin/plugin.js → test/fixtures/programmatic/plugin/plugin.js b/test/fixtures/plugin/plugin.js → test/fixtures/programmatic/plugin/plugin.js
diff --git a/test/fixtures/plugin/serverless.yml → ...xtures/programmatic/plugin/serverless.yml b/test/fixtures/plugin/serverless.yml → ...xtures/programmatic/plugin/serverless.yml
diff --git a/test/fixtures/provisionedConcurrency/core.js → ...ogrammatic/provisionedConcurrency/core.js b/test/fixtures/provisionedConcurrency/core.js → ...ogrammatic/provisionedConcurrency/core.js
diff --git a/...res/provisionedConcurrency/serverless.yml → ...tic/provisionedConcurrency/serverless.yml b/...res/provisionedConcurrency/serverless.yml → ...tic/provisionedConcurrency/serverless.yml
diff --git a/test/fixtures/requestSchema/dummySchema.json → ...ogrammatic/requestSchema/dummySchema.json b/test/fixtures/requestSchema/dummySchema.json → ...ogrammatic/requestSchema/dummySchema.json
diff --git a/test/fixtures/requestSchema/serverless.yml → ...programmatic/requestSchema/serverless.yml b/test/fixtures/requestSchema/serverless.yml → ...programmatic/requestSchema/serverless.yml
diff --git a/test/fixtures/requestSchema/target.js → ...ures/programmatic/requestSchema/target.js b/test/fixtures/requestSchema/target.js → ...ures/programmatic/requestSchema/target.js
diff --git a/test/fixtures/s3/core.js → test/fixtures/programmatic/s3/core.js b/test/fixtures/s3/core.js → test/fixtures/programmatic/s3/core.js
diff --git a/test/fixtures/s3/serverless.yml → test/fixtures/programmatic/s3/serverless.yml b/test/fixtures/s3/serverless.yml → test/fixtures/programmatic/s3/serverless.yml
diff --git a/test/fixtures/s3/utils.js → test/fixtures/programmatic/s3/utils.js b/test/fixtures/s3/utils.js → test/fixtures/programmatic/s3/utils.js
diff --git a/test/fixtures/schedule/core.js → test/fixtures/programmatic/schedule/core.js b/test/fixtures/schedule/core.js → test/fixtures/programmatic/schedule/core.js
diff --git a/test/fixtures/schedule/serverless.yml → ...ures/programmatic/schedule/serverless.yml b/test/fixtures/schedule/serverless.yml → ...ures/programmatic/schedule/serverless.yml
diff --git a/test/fixtures/schedule/utils.js → test/fixtures/programmatic/schedule/utils.js b/test/fixtures/schedule/utils.js → test/fixtures/programmatic/schedule/utils.js
diff --git a/test/fixtures/sns/core.js → test/fixtures/programmatic/sns/core.js b/test/fixtures/sns/core.js → test/fixtures/programmatic/sns/core.js
diff --git a/test/fixtures/sns/serverless.yml → .../fixtures/programmatic/sns/serverless.yml b/test/fixtures/sns/serverless.yml → .../fixtures/programmatic/sns/serverless.yml
diff --git a/test/fixtures/sns/utils.js → test/fixtures/programmatic/sns/utils.js b/test/fixtures/sns/utils.js → test/fixtures/programmatic/sns/utils.js
diff --git a/test/fixtures/sqs/core.js → test/fixtures/programmatic/sqs/core.js b/test/fixtures/sqs/core.js → test/fixtures/programmatic/sqs/core.js
diff --git a/test/fixtures/sqs/serverless.yml → .../fixtures/programmatic/sqs/serverless.yml b/test/fixtures/sqs/serverless.yml → .../fixtures/programmatic/sqs/serverless.yml
diff --git a/test/fixtures/sqs/utils.js → test/fixtures/programmatic/sqs/utils.js b/test/fixtures/sqs/utils.js → test/fixtures/programmatic/sqs/utils.js
diff --git a/test/fixtures/stream/core.js → test/fixtures/programmatic/stream/core.js b/test/fixtures/stream/core.js → test/fixtures/programmatic/stream/core.js
diff --git a/test/fixtures/stream/serverless.yml → ...xtures/programmatic/stream/serverless.yml b/test/fixtures/stream/serverless.yml → ...xtures/programmatic/stream/serverless.yml
diff --git a/test/fixtures/stream/utils.js → test/fixtures/programmatic/stream/utils.js b/test/fixtures/stream/utils.js → test/fixtures/programmatic/stream/utils.js
diff --git a/test/fixtures/variables/config.json → ...programmatic/variables-legacy/config.json b/test/fixtures/variables/config.json → ...programmatic/variables-legacy/config.json
diff --git a/.../fixtures/variables-legacy/serverless.yml → ...grammatic/variables-legacy/serverless.yml b/.../fixtures/variables-legacy/serverless.yml → ...grammatic/variables-legacy/serverless.yml
diff --git a/test/fixtures/variables/terraform.tfstate → ...mmatic/variables-legacy/terraform.tfstate b/test/fixtures/variables/terraform.tfstate → ...mmatic/variables-legacy/terraform.tfstate
diff --git a/test/fixtures/websocket/core.js → test/fixtures/programmatic/websocket/core.js b/test/fixtures/websocket/core.js → test/fixtures/programmatic/websocket/core.js
diff --git a/test/fixtures/websocket/serverless.yml → ...res/programmatic/websocket/serverless.yml b/test/fixtures/websocket/serverless.yml → ...res/programmatic/websocket/serverless.yml
diff --git a/test/integration/apiGateway.test.js b/test/integration/apiGateway.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { confirmCloudWatchLogs } = require('../utils/misc');
 const { deployService, removeService, fetch } = require('../utils/integration');

diff --git a/test/integration/apiGatewayExternal.test.js b/test/integration/apiGatewayExternal.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { deployService, removeService, fetch } = require('../utils/integration');
 const { createRestApi, deleteRestApi, getResources } = require('../utils/apiGateway');

diff --git a/test/integration/cognitoUserPool.test.js b/test/integration/cognitoUserPool.test.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const hasFailed = require('@serverless/test/has-failed');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const {
   createUserPool,

diff --git a/test/integration/eventBridge.test.js b/test/integration/eventBridge.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { confirmCloudWatchLogs } = require('../utils/misc');
 const {

diff --git a/test/integration/functionDestinations.test.js b/test/integration/functionDestinations.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 const { confirmCloudWatchLogs } = require('../utils/misc');
 
 const { deployService, removeService } = require('../utils/integration');

diff --git a/test/integration/httpApi.test.js b/test/integration/httpApi.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 const { confirmCloudWatchLogs } = require('../utils/misc');
 
 const { deployService, removeService, fetch } = require('../utils/integration');

diff --git a/test/integration/infra-dependent/fileSystemConfig.test.js b/test/integration/infra-dependent/fileSystemConfig.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../../fixtures');
+const fixtures = require('../../fixtures/programmatic');
 
 const awsRequest = require('@serverless/test/aws-request');
 const crypto = require('crypto');

diff --git a/test/integration/infra-dependent/msk.test.js b/test/integration/infra-dependent/msk.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../../fixtures');
+const fixtures = require('../../fixtures/programmatic');
 const { confirmCloudWatchLogs } = require('../../utils/misc');
 const {
   isDependencyStackAvailable,

diff --git a/test/integration/iot.test.js b/test/integration/iot.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { expect } = require('chai');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { publishIotData } = require('../utils/iot');
 const { confirmCloudWatchLogs } = require('../utils/misc');

diff --git a/test/integration/iotFleetProvisioning.test.js b/test/integration/iotFleetProvisioning.test.js
@@ -2,7 +2,7 @@
 
 const awsRequest = require('@serverless/test/aws-request');
 const { expect } = require('chai');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 const { deployService, removeService } = require('../utils/integration');
 const { resolveIotEndpoint } = require('../utils/iot');
 

diff --git a/test/integration/provisionedConcurrency.test.js b/test/integration/provisionedConcurrency.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { createKinesisStream, deleteKinesisStream, putKinesisRecord } = require('../utils/kinesis');
 const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../utils/sqs');

diff --git a/test/integration/s3.test.js b/test/integration/s3.test.js
@@ -3,7 +3,7 @@
 const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { createBucket, createAndRemoveInBucket, deleteBucket } = require('../utils/s3');
 const { deployService, removeService } = require('../utils/integration');

diff --git a/test/integration/schedule.test.js b/test/integration/schedule.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { expect } = require('chai');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { deployService, removeService } = require('../utils/integration');
 const { confirmCloudWatchLogs } = require('../utils/misc');

diff --git a/test/integration/sns.test.js b/test/integration/sns.test.js
@@ -3,7 +3,7 @@
 const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { confirmCloudWatchLogs } = require('../utils/misc');
 const { createSnsTopic, removeSnsTopic, publishSnsMessage } = require('../utils/sns');

diff --git a/test/integration/sqs.test.js b/test/integration/sqs.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 const hasFailed = require('@serverless/test/has-failed');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../utils/sqs');
 const { confirmCloudWatchLogs } = require('../utils/misc');

diff --git a/test/integration/stream.test.js b/test/integration/stream.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { createKinesisStream, deleteKinesisStream, putKinesisRecord } = require('../utils/kinesis');
 const { putDynamoDbItem } = require('../utils/dynamodb');

diff --git a/test/integration/websocket.test.js b/test/integration/websocket.test.js
@@ -5,7 +5,7 @@ const { expect } = require('chai');
 const awsRequest = require('@serverless/test/aws-request');
 const log = require('log').get('serverless:test');
 const wait = require('timers-ext/promise/sleep');
-const fixtures = require('../fixtures');
+const fixtures = require('../fixtures/programmatic');
 
 const { confirmCloudWatchLogs } = require('../utils/misc');
 const { deployService, removeService } = require('../utils/integration');

diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
@@ -16,7 +16,7 @@ const CLI = require('../../../lib/classes/CLI');
 const ServerlessError = require('../../../lib/serverless-error');
 const conditionallyLoadDotenv = require('../../../lib/cli/conditionally-load-dotenv');
 const runServerless = require('../../utils/run-serverless');
-const fixtures = require('../../fixtures');
+const fixtures = require('../../fixtures/programmatic');
 const fs = require('fs');
 
 describe('Serverless', () => {
@@ -228,7 +228,7 @@ describe('Serverless [new tests]', () => {
       it('Should fallback to local version when it is found and "enableLocalInstallationFallback" is not set', () =>
         runServerless({
           fixture: 'locallyInstalledServerless',
-          cliArgs: ['-v'],
+          command: 'print',
           modulesCacheStub: {},
         }).then(({ serverless }) => {
           expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([]);
@@ -242,7 +242,7 @@ describe('Serverless [new tests]', () => {
         runServerless({
           fixture: 'locallyInstalledServerless',
           configExt: { enableLocalInstallationFallback: false },
-          cliArgs: ['-v'],
+          command: 'print',
           modulesCacheStub: {},
         }).then(({ serverless }) => {
           serverlessWithDisabledLocalInstallationFallback = serverless;
@@ -261,7 +261,7 @@ describe('Serverless [new tests]', () => {
         runServerless({
           fixture: 'locallyInstalledServerless',
           configExt: { enableLocalInstallationFallback: true },
-          cliArgs: ['-v'],
+          command: 'print',
           modulesCacheStub: {},
         }).then(({ serverless }) => {
           expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([
@@ -279,7 +279,7 @@ describe('Serverless [new tests]', () => {
           runServerless({
             serverlessDir: path.resolve(servicePath, 'node_modules/serverless'),
             cwd: servicePath,
-            cliArgs: ['-v'],
+            command: 'print',
           }).then(({ serverless }) => {
             expect(Array.from(serverless.triggeredDeprecations)).to.not.include(
               'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING'
@@ -294,7 +294,7 @@ describe('Serverless [new tests]', () => {
 
   describe('When local version not available', () => {
     it('Should run without notice', () =>
-      runServerless({ fixture: 'aws', cliArgs: ['-v'], modulesCacheStub: {} }).then(
+      runServerless({ fixture: 'aws', command: 'print', modulesCacheStub: {} }).then(
         ({ serverless }) => {
           expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([]);
           expect(serverless._isInvokedByGlobalInstallation).to.be.false;
@@ -328,7 +328,8 @@ describe('Serverless [new tests]', () => {
     it('Should load environment variables from default .env file if no matching stage', async () => {
       const result = await runServerless({
         cwd: servicePath,
-        cliArgs: ['package'],
+        command: 'package',
+        shouldUseLegacyVariablesResolver: true,
       });
 
       expect(result.serverless.service.custom.fromDefaultEnv).to.equal('valuefromdefault');
@@ -342,7 +343,7 @@ describe('Serverless [new tests]', () => {
     before(async () => {
       ({ serverless } = await runServerless({
         fixture: 'aws',
-        cliArgs: ['package'],
+        command: 'package',
       }));
     });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		'use strict';

		module.exports = require('@serverless/test/setup-fixtures-engine')(__dirname);