Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into editor
Browse files Browse the repository at this point in the history
  • Loading branch information
flops committed Jun 21, 2019
2 parents 4029604 + bf0edbf commit 7bcdc78
Show file tree
Hide file tree
Showing 39 changed files with 188 additions and 161 deletions.
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
sudo: required

git:
depth: 10
depth: false

addons:
chrome: stable
sonarcloud:
organization: "ringcentral"
token:
secure: "xzS9szSu7A+yzpqf4n/YIB5LFVhySghNPlekW5kFc/t0+xefFBgfYSDr2yXhcbMyL/ZlCmIL8/RSdL83QtgThI4vLQfRp/DQTrap58D3aboCb9yKY57ELzv/jwbH1tJ3ocy/GzTbDDcHb0V/tzElELGWPcKQIbu9T2RisJxpo7P+XGjEV6eDlzsE/rFh6tP7gF2dEE/RcvjGfOamOFLK/XtUPAeO50sKqnDQvmU3GfKtwwnGLFAqIPJOU5m8BJGfZrhDY18EOwLxAOXCCb+//FwiOm0AiR+N0/WnZGP7ZLcOMcVKcje9IGg0+j5B5wziCGuZtJuDh9VyORzrxsgXL/xhUKoMy8yQ5f70ziMFWG/oJexQP+ItDYKkktXEM8PkNrtgxnDcHSDN37Xda9m0vSAwrLInISnG65jIsJO53QY3eemd9DBZMPOGTWYAkMZK8Si1GcXNhfAhTT2e6nKZIYvDy/ADoPSgk1hqyxMZOdmqQQSVPg0qur1lk8Lmvc25UyPqZt8hsldOKfwkg5GEXYC5kLuRJa+ZuaMjWmNlg1DEGhyhE19JhgRIsvPF7u654RKwaTzMndCAR2vuMfspK+YVtPHJVt6EMw+jnjilt4dZb0Qp6CHYgQnSNq+p256oc73MjvA5lq+foTgat89fFgPoPp63sLiaRA8OYLfxQwA="

language: node_js
dist: trusty

node_js:
- "10"
Expand All @@ -18,7 +23,9 @@ cache:
- $HOME/.npm
- node_modules

script: xvfb-run npm run build:ci
script:
- xvfb-run npm run build:ci
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sonar-scanner; fi' # sonar only on non-PRs https://github.com/travis-ci/travis-ci/issues/10062

stages:
- test
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[![npm](https://img.shields.io/npm/v/npm.svg)](https://www.npmjs.com/package/testring)
[![Travis status](https://img.shields.io/travis/ringcentral/testring/master.svg?style=flat)](https://travis-ci.org/ringcentral/testring)
[![Coveralls](https://img.shields.io/coveralls/ringcentral/testring/master.svg?style=flat)](https://coveralls.io/github/ringcentral/testring)
[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=ringcentral_testring&metric=alert_status)](https://sonarcloud.io/dashboard?id=ringcentral_testring)

A simple way to create, run and support automatic UI tests, based on Node.js.

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
"allowBranch": "master"
}
},
"version": "0.5.2"
"version": "0.5.3"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"test:e2e": "lerna run --stream --scope @testring/e2e-test-app e2e",
"test:e2e-simple": "lerna run --stream --scope @testring/e2e-test-app e2e-simple",
"test:coverage": "nyc npm test",
"test:publish": "coveralls < ./coverage/lcov.info && rimraf ./coverage -G",
"test:publish": "coveralls < ./coverage/lcov.info && rimraf ./coverage/lcov-report -G",
"test:ci": "npm run test:coverage && npm run test:e2e && npm run test:publish",
"build": "npm run build:main && npm run build:devtool && npm run build:extension",
"build:main": "lerna exec --ignore=\"@testring/@(e2e-test-app|devtool-frontend|devtool-extension)\" -- tsc --target es2015",
Expand Down
16 changes: 8 additions & 8 deletions packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/api",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -10,12 +10,12 @@
"author": "RingCentral",
"license": "MIT",
"dependencies": {
"@testring/async-breakpoints": "0.5.2",
"@testring/http-api": "0.5.2",
"@testring/logger": "0.5.2",
"@testring/transport": "0.5.2",
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2",
"@testring/web-application": "0.5.2"
"@testring/async-breakpoints": "0.5.3",
"@testring/http-api": "0.5.3",
"@testring/logger": "0.5.3",
"@testring/transport": "0.5.3",
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3",
"@testring/web-application": "0.5.3"
}
}
2 changes: 1 addition & 1 deletion packages/async-breakpoints/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/async-breakpoints",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand Down
16 changes: 8 additions & 8 deletions packages/browser-proxy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/browser-proxy",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -10,18 +10,18 @@
"author": "RingCentral",
"license": "MIT",
"dependencies": {
"@testring/child-process": "0.5.2",
"@testring/logger": "0.5.2",
"@testring/pluggable-module": "0.5.2",
"@testring/transport": "0.5.2",
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2",
"@testring/child-process": "0.5.3",
"@testring/logger": "0.5.3",
"@testring/pluggable-module": "0.5.3",
"@testring/transport": "0.5.3",
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3",
"@types/node": "10.5.6",
"@types/yargs": "12.0.0",
"yargs": "12.0.2"
},
"devDependencies": {
"@testring/test-utils": "0.5.2",
"@testring/test-utils": "0.5.3",
"chai": "4.2.0"
}
}
6 changes: 3 additions & 3 deletions packages/child-process/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@testring/child-process",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
"type": "git",
"url": "https://github.com/ringcentral/testring.git"
},
"dependencies": {
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2"
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3"
},
"author": "RingCentral",
"license": "MIT",
Expand Down
8 changes: 4 additions & 4 deletions packages/cli-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/cli-config",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -10,9 +10,9 @@
"author": "RingCentral",
"license": "MIT",
"dependencies": {
"@testring/logger": "0.5.2",
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2",
"@testring/logger": "0.5.3",
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3",
"@types/deepmerge": "2.2.0",
"@types/yargs": "12.0.0",
"deepmerge": "2.1.1",
Expand Down
26 changes: 13 additions & 13 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/cli",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -10,18 +10,18 @@
"author": "RingCentral",
"license": "MIT",
"dependencies": {
"@testring/browser-proxy": "0.5.2",
"@testring/cli-config": "0.5.2",
"@testring/devtool-backend": "0.5.2",
"@testring/fs-reader": "0.5.2",
"@testring/http-api": "0.5.2",
"@testring/logger": "0.5.2",
"@testring/plugin-api": "0.5.2",
"@testring/test-run-controller": "0.5.2",
"@testring/test-worker": "0.5.2",
"@testring/transport": "0.5.2",
"@testring/types": "0.5.2",
"@testring/web-application": "0.5.2",
"@testring/browser-proxy": "0.5.3",
"@testring/cli-config": "0.5.3",
"@testring/devtool-backend": "0.5.3",
"@testring/fs-reader": "0.5.3",
"@testring/http-api": "0.5.3",
"@testring/logger": "0.5.3",
"@testring/plugin-api": "0.5.3",
"@testring/test-run-controller": "0.5.3",
"@testring/test-worker": "0.5.3",
"@testring/transport": "0.5.3",
"@testring/types": "0.5.3",
"@testring/web-application": "0.5.3",
"@types/yargs": "12.0.0",
"yargs": "12.0.2"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/client-ws-transport/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/client-ws-transport",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -10,7 +10,7 @@
"author": "RingCentral",
"license": "MIT",
"dependencies": {
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2"
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3"
}
}
10 changes: 5 additions & 5 deletions packages/dependencies-builder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/dependencies-builder",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -10,10 +10,10 @@
"author": "RingCentral",
"license": "MIT",
"dependencies": {
"@testring/devtool-execution-plugin": "0.5.2",
"@testring/test-utils": "0.5.2",
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2",
"@testring/devtool-execution-plugin": "0.5.3",
"@testring/test-utils": "0.5.3",
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3",
"@types/babel-traverse": "6.25.4",
"@types/babylon": "6.16.3",
"babel-traverse": "6.26.0",
Expand Down
22 changes: 11 additions & 11 deletions packages/devtool-backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/devtool-backend",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -14,15 +14,15 @@
"start:watch": "nodemon --watch 'src/**/*' -e ts,tsx --exec 'ts-node' ./src/index.ts"
},
"dependencies": {
"@testring/child-process": "0.5.2",
"@testring/devtool-extension": "0.5.2",
"@testring/devtool-frontend": "0.5.2",
"@testring/devtool-store": "0.5.2",
"@testring/logger": "0.5.2",
"@testring/pluggable-module": "0.5.2",
"@testring/transport": "0.5.2",
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2",
"@testring/child-process": "0.5.3",
"@testring/devtool-extension": "0.5.3",
"@testring/devtool-frontend": "0.5.3",
"@testring/devtool-store": "0.5.3",
"@testring/logger": "0.5.3",
"@testring/pluggable-module": "0.5.3",
"@testring/transport": "0.5.3",
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3",
"@types/babel-traverse": "6.25.4",
"@types/express-serve-static-core": "4.16.2",
"@types/node": "10.5.6",
Expand All @@ -35,7 +35,7 @@
"ws": "6.0.0"
},
"devDependencies": {
"@testring/test-utils": "0.5.2",
"@testring/test-utils": "0.5.3",
"chai": "4.2.0",
"request": "2.87.0",
"request-promise": "4.2.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/devtool-execution-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/devtool-execution-plugin",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -13,8 +13,8 @@
"@babel/core": "7.4.4",
"@babel/template": "7.4.4",
"@babel/types": "7.4.4",
"@testring/transport": "0.5.2",
"@testring/types": "0.5.2",
"@testring/transport": "0.5.3",
"@testring/types": "0.5.3",
"@types/babel-types": "7.0.7",
"@types/babel__core": "7.1.2"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/devtool-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/devtool-extension",
"version": "0.5.2",
"version": "0.5.3",
"main": "./index.js",
"types": "./index.d.ts",
"repository": {
Expand All @@ -15,9 +15,9 @@
"build:watch": "webpack --config webpack.config.ts --watch --devtool inline-source-map"
},
"devDependencies": {
"@testring/client-ws-transport": "0.5.2",
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2",
"@testring/client-ws-transport": "0.5.3",
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3",
"@types/chrome": "0.0.83",
"@types/webpack": "4.4.31",
"chrome-launcher": "0.10.7",
Expand Down
1 change: 1 addition & 0 deletions packages/devtool-extension/static/popup.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Testring popup</title>
Expand Down
8 changes: 4 additions & 4 deletions packages/devtool-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/devtool-frontend",
"version": "0.5.2",
"version": "0.5.3",
"main": "./index.js",
"repository": {
"type": "git",
Expand All @@ -13,9 +13,9 @@
"build:watch": "webpack --config webpack.config.ts --watch --devtool inline-source-map"
},
"devDependencies": {
"@testring/client-ws-transport": "0.5.2",
"@testring/types": "0.5.2",
"@testring/utils": "0.5.2",
"@testring/client-ws-transport": "0.5.3",
"@testring/types": "0.5.3",
"@testring/utils": "0.5.3",
"@types/react": "16.8.17",
"@types/react-dom": "16.8.4",
"@types/webpack": "4.4.31",
Expand Down
4 changes: 2 additions & 2 deletions packages/devtool-store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/devtool-store",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"types": "./src/index.ts",
"repository": {
Expand All @@ -10,7 +10,7 @@
"author": "RingCentral",
"license": "MIT",
"dependencies": {
"@testring/types": "0.5.2",
"@testring/types": "0.5.3",
"redux": "4.0.1"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/e2e-test-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@testring/e2e-test-app",
"private": true,
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"repository": {
"type": "git",
Expand All @@ -17,9 +17,9 @@
"e2e": "npm run test:simple-run && npm run test:selenium"
},
"dependencies": {
"@testring/plugin-babel": "0.5.2",
"@testring/plugin-selenium-driver": "0.5.2",
"@testring/plugin-babel": "0.5.3",
"@testring/plugin-selenium-driver": "0.5.3",
"babel-preset-es2015": "6.24.1",
"testring": "0.5.2"
"testring": "0.5.3"
}
}
2 changes: 1 addition & 1 deletion packages/element-path/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@testring/element-path",
"version": "0.5.2",
"version": "0.5.3",
"main": "./dist/index.js",
"typings": "./src/index.ts",
"repository": {
Expand Down

0 comments on commit 7bcdc78

Please sign in to comment.