Skip to content

Commit

Permalink
move integration tests into own workspace
Browse files Browse the repository at this point in the history
this is required due to a dependency resolution conflict within @testing-library/dom. See testing-library/dom-testing-library#963
  • Loading branch information
a-b-r-o-w-n committed Jun 11, 2021
1 parent 791eba6 commit d2e62f0
Show file tree
Hide file tree
Showing 54 changed files with 2,588 additions and 1,050 deletions.
3 changes: 0 additions & 3 deletions Composer/cypress/.eslintrc.js

This file was deleted.

1 change: 0 additions & 1 deletion Composer/cypress/fixtures/luPublish/error.json

This file was deleted.

20 changes: 0 additions & 20 deletions Composer/cypress/fixtures/luPublish/success.json

This file was deleted.

78 changes: 0 additions & 78 deletions Composer/cypress/integration/examples/cookies.spec.js

This file was deleted.

52 changes: 0 additions & 52 deletions Composer/cypress/integration/examples/local_storage.spec.js

This file was deleted.

56 changes: 0 additions & 56 deletions Composer/cypress/integration/examples/navigation.spec.js

This file was deleted.

59 changes: 0 additions & 59 deletions Composer/cypress/integration/examples/viewport.spec.js

This file was deleted.

21 changes: 8 additions & 13 deletions Composer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,23 @@
"packages/adaptive-form",
"packages/client",
"packages/electron-server",
"packages/extension",
"packages/extension-client",
"packages/extension",
"packages/form-dialogs",
"packages/integration-tests",
"packages/intellisense",
"packages/lib/*",
"packages/server",
"packages/server-workers",
"packages/server",
"packages/test-utils",
"packages/tools/built-in-functions",
"packages/tools/language-servers/*",
"packages/types",
"packages/ui-plugins/*"
],
"nohoist": [
"**/server-workers/**"
"**/server-workers/**",
"**/integration-tests/**"
]
},
"scripts": {
Expand All @@ -75,11 +77,9 @@
"test": "cross-env NODE_OPTIONS=--max-old-space-size=4096 yarn typecheck && jest --silent",
"test:watch": "yarn typecheck && jest --watch",
"test:ci": "cross-env CI=true yarn test --coverage --no-cache --forceExit --reporters=default --reporters=jest-github-actions-reporter --testLocationInResults",
"test:integration": "cypress run --browser edge",
"test:integration:start-server": "node scripts/e2e.js",
"test:integration:open": "cypress open",
"test:integration:clean": "node scripts/clean-e2e.js",
"test:integration:clean-all": "node scripts/clean-e2e.js --all",
"test:integration": "yarn workspace @bfc/integration-tests start",
"test:integration:start-server": "yarn workspace @bfc/integration-tests start:server",
"test:integration:open": "yarn workspace @bfc/integration-tests open",
"lint": "wsrun --exclude-missing --collect-logs --report lint",
"lint:ci": "wsrun --exclude-missing --collect-logs --report --no-prefix lint --format github-actions",
"lint:fix": "wsrun --exclude-missing --collect-logs --report lint:fix",
Expand Down Expand Up @@ -120,20 +120,15 @@
"@babel/preset-typescript": "^7.9.0",
"@bfc/eslint-plugin-bfcomposer": "*",
"@emotion/babel-preset-css-prop": "^10.0.27",
"@testing-library/cypress": "7.0.0-beta.1",
"@testing-library/user-event": "12.6.3",
"@typescript-eslint/eslint-plugin": "2.34.0",
"@typescript-eslint/parser": "2.34.0",
"chalk": "^4.0.0",
"concurrently": "^4.1.0",
"coveralls": "^3.1.0",
"cross-env": "^6.0.3",
"cypress": "^5.0.0",
"cypress-plugin-tab": "^1.0.5",
"eslint": "7.0.0",
"eslint-config-prettier": "6.11.0",
"eslint-formatter-github-actions": "^1.0.0",
"eslint-plugin-cypress": "2.11.1",
"eslint-plugin-emotion": "10.0.27",
"eslint-plugin-format-message": "6.2.3",
"eslint-plugin-import": "2.20.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"projectId": "27ikaq",
"ignoreTestFiles": [
"**/examples/*",
"*.hot-update.js"
],
"ignoreTestFiles": ["**/examples/*", "*.hot-update.js"],
"supportFile": "cypress/support/index.ts",
"video": false,
"videoUploadOnPasses": false,
Expand Down
3 changes: 3 additions & 0 deletions Composer/packages/integration-tests/cypress/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: ['../../.eslintrc.js', 'plugin:cypress/recommended'],
};
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"name": "Using fixtures to represent data",
"email": "hello@cypress.io",
"body": "Fixtures are a great way to mock data for responses to routes"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"error": "Access denied due to invalid subscription key. Make sure you are subscribed to an API you are trying to call and provide the right key."
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"status": {
"MyProject_main_en-us_lu": {
"version": "0000000001",
"checksum": "",
"status": 1
}
},
"luFiles": [
{
"content": "#Dummy\r\n--I am Dummy",
"diagnostics": [],
"id": "Main",
"intents": [],
"relativePath": "Main/Main.lu",
"lastPublishTime": 2,
"lastUpdateTime": 1
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"id": 8739,
"name": "Jane",
"email": "jane@example.com"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,4 @@
"bs": "target end-to-end models"
}
}
]
]
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d2e62f0

Please sign in to comment.