Skip to content

Commit a4bea7a

Browse files
committed
Merge branch 'selianize'
2 parents 7686794 + c4fd5e9 commit a4bea7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2218
-580
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ yarn-error.log
1818
dist/
1919
.web-extension-id
2020
*.log
21+
tests/webdriver/

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1+
sudo: required
12
language: node_js
23
node_js:
34
- "node"
5+
services:
6+
- docker
7+
before_install:
8+
- docker-compose up -d
9+
install:
10+
- yarn
11+
- yarn build:runner
12+
- yarn build:selianize
13+
- yarn build:runner:examples
414
script:
515
- yarn lint
616
- yarn test
17+
- yarn test:webdriver --server http://localhost:4444/wd/hub

docker-compose.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: '3'
2+
services:
3+
nginx:
4+
image: "nginx"
5+
ports:
6+
- "80:80"
7+
volumes:
8+
- "./tests/static:/usr/share/nginx/html:ro"
9+
selenium:
10+
image: "selenium/standalone-chrome:3.11.0-antimony"
11+
ports:
12+
- "4444:4444"

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@
77
"start": "cd packages/selenium-ide && yarn start",
88
"build:ext": "cd packages/selenium-ide && yarn build",
99
"build:runner": "cd packages/selenium-side-runner && yarn build",
10+
"build:runner:examples": "cd tests && mkdir -p webdriver && ls examples | grep \"\\.side$\" | xargs node simple-export.js",
11+
"build:selianize": "cd packages/selianize && yarn build",
1012
"build:ext:prod": "cd packages/selenium-ide && yarn build-prod",
1113
"pack:chrome": "cd packages/selenium-ide && yarn build-chrome",
1214
"pack:firefox": "cd packages/selenium-ide && yarn build-firefox",
1315
"test": "jest",
16+
"test:webdriver": "cd tests/webdriver && node ../../packages/selenium-side-runner/dist/index.js",
1417
"lint": "eslint packages/selenium-ide/src/{neo,selianize}/ packages/selenium-side-runner/src/ --ext .js --ext .jsx",
1518
"postinstall": "lerna bootstrap"
1619
},
1720
"jest": {
1821
"testMatch": [
19-
"**/packages/**/src/**/__test?(s)__/**/*.js?(x)"
22+
"**/packages/**/__test?(s)__/**/*.js?(x)"
2023
]
2124
},
2225
"devDependencies": {

packages/selenium-ide/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"react-tooltip": "^3.4.0",
6363
"react-transition-group": "^2.2.1",
6464
"scroll-into-view-if-needed": "^1.4.0",
65+
"selianize": "*",
6566
"sort-array": "^2.0.0",
6667
"styled-components": "^2.1.2",
6768
"ua-parser-js": "^0.7.17",

0 commit comments

Comments
 (0)