Skip to content

Commit 15f9215

Browse files
author
david califf
committed
Merge branch 'v3' into multi-select
2 parents 6423e1e + 9973c26 commit 15f9215

File tree

37 files changed

+6066
-6008
lines changed

37 files changed

+6066
-6008
lines changed

Diff for: .github/PULL_REQUEST_TEMPLATE.md

+7
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1+
<!--
2+
Selenium IDE is moving to an electron app!!!.
3+
For the time being the team will support both the extension and the app, until the app reaches complete feature parity with the extension.
4+
5+
If you want to submit a PR to the electron app, please submit to master.
6+
To submit a PR to the extension submit to the branch v3
7+
-->
18
- [ ] By placing an `X` in the preceding checkbox, I verify that I have signed the [Contributor License Agreement](https://github.com/SeleniumHQ/selenium/blob/master/CONTRIBUTING.md#step-6-sign-the-cla)

Diff for: babel.config.js

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
const fs = require('fs')
2+
const path = require('path')
3+
4+
module.exports = {
5+
babelrcRoots: fs
6+
.readdirSync('packages')
7+
.map(dirname => path.join(process.cwd(), 'packages', dirname))
8+
.filter(dirpath => {
9+
const stats = fs.statSync(dirpath)
10+
11+
return stats.isDirectory()
12+
}),
13+
}

Diff for: docs/introduction/faq.md

+11
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,14 @@ __NOTE: If you already have the plugin installed (e.g., on the laptop you're try
6262
* [Download instructions for the required ".crx" installer](https://stackoverflow.com/questions/25480912/how-to-download-a-chrome-extension-without-installing-it)
6363

6464
__NOTE: you can't obtain the ".crx" file directly from the Chrome store. Instead, you need to install it once locally, and then go to the installation directory on your machine to retrieve it.__
65+
66+
### Why does no save dialog appear once a plugin is attached?
67+
Due to a current [Chrome bug](https://bugs.chromium.org/p/chromium/issues/detail?id=922373), if you don't reply to the emitted message from Selenium IDE, further processing won't happen. In order to workaround the issue, make sure to listen for the action `emit` with the entity `project` and reply with `undefined`:
68+
69+
```javascript
70+
chrome.runtime.onMessageExternal.addListener((message, sender, sendResponse) => {
71+
if (message.action === "emit" && message.entity === "project") {
72+
sendResponse(undefined);
73+
}
74+
});
75+
```

Diff for: lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"packages": [
44
"packages/*"
55
],
6-
"version": "3.5.9",
6+
"version": "3.5.11",
77
"npmClient": "yarn"
88
}

Diff for: package.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,29 @@
3030
"moduleNameMapper": {
3131
"^.+\\.(css|scss)$": "identity-obj-proxy"
3232
},
33-
"setupTestFrameworkScriptFile": "./packages/selenium-ide/scripts/jest/test.config.js",
33+
"setupFilesAfterEnv": [
34+
"./packages/selenium-ide/scripts/jest/test.config.js"
35+
],
3436
"testMatch": [
3537
"**/packages/**/__test?(s)__/**/*.js?(x)"
3638
]
3739
},
3840
"devDependencies": {
41+
"@babel/core": "^7.3.4",
3942
"babel-eslint": "^10.0.1",
40-
"babel-jest": "^23.6.0",
43+
"babel-jest": "^24.3.1",
4144
"eslint": "^5.8.0",
4245
"eslint-config-prettier": "^3.1.0",
4346
"eslint-plugin-jest": "^21.27.1",
4447
"eslint-plugin-prettier": "^3.0.0",
4548
"eslint-plugin-react": "^7.11.1",
4649
"identity-obj-proxy": "^3.0.0",
47-
"jest": "^23.6.0",
50+
"jest": "^24.3.1",
4851
"lerna": "^3.4.3",
4952
"prettier": "^1.14.3",
5053
"stylelint": "^9.7.1",
5154
"stylelint-config-prettier": "^4.0.0",
5255
"stylelint-config-standard": "^18.2.0",
53-
"stylelint-prettier": "^1.0.3",
54-
"web-ext": "^2.4.0"
56+
"stylelint-prettier": "^1.0.3"
5557
}
5658
}

Diff for: packages/browser-webdriver/.babelrc

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
{
2-
presets: [ "node8" ]
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"targets": {
7+
"node": "8"
8+
}
9+
}
10+
]
11+
]
312
}

Diff for: packages/browser-webdriver/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "browser-webdriver",
3-
"version": "3.5.9",
3+
"version": "3.5.10",
44
"main": "build/webdriver.js",
55
"repository": "https://github.com/SeleniumHQ/selenium-ide",
66
"license": "Apache-2.0",
@@ -13,8 +13,8 @@
1313
"build/webdriver.js"
1414
],
1515
"devDependencies": {
16-
"babel-cli": "^6.26.0",
17-
"babel-preset-node8": "^1.2.0",
16+
"@babel/cli": "^7.2.3",
17+
"@babel/preset-env": "^7.3.4",
1818
"browserify": "^16.2.2",
1919
"selenium-webdriver": "3.6.0",
2020
"watchify": "^3.11.0"

0 commit comments

Comments
 (0)