Skip to content

Commit 457ef79

Browse files
committed
Merge branch '3.x' into ws-messages-ppt
2 parents dccf53f + b2a8452 commit 457ef79

File tree

4 files changed

+59
-1
lines changed

4 files changed

+59
-1
lines changed

.circleci/build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cd test
2+
3+
docker-compose build
4+
docker-compose pull php selenium.chrome

.circleci/config.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
version: 2.1
2+
3+
orbs:
4+
browser-tools: circleci/[email protected]
5+
6+
defaults: &defaults
7+
machine:
8+
image: default
9+
docker_layer_caching: false
10+
steps:
11+
- checkout
12+
- run: .circleci/build.sh
13+
- browser-tools/install-chrome:
14+
chrome-version: 116.0.5845.96
15+
replace-existing: true
16+
- run:
17+
command: docker-compose run --rm test-acceptance.puppeteer
18+
working_directory: test
19+
when: always
20+
- run:
21+
command: docker-compose run --rm test-rest
22+
working_directory: test
23+
when: always
24+
- run:
25+
command: docker-compose run --rm test-acceptance.webdriverio
26+
working_directory: test
27+
when: always
28+
- run:
29+
command: docker-compose run --rm test-bdd.faker
30+
working_directory: test
31+
when: always
32+
33+
jobs:
34+
docker:
35+
<<: *defaults
36+
environment:
37+
- NODE_VERSION: 18.16.0
38+
39+
workflows:
40+
version: 2
41+
42+
test_all:
43+
jobs:
44+
- docker

.circleci/test.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
cd test
6+
7+
docker-compose run --rm test-unit &&
8+
docker-compose run --rm test-rest &&
9+
docker-compose run --rm test-acceptance.webdriverio &&
10+
docker-compose run --rm test-acceptance.puppeteer

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"lodash.merge": "4.6.2",
105105
"mkdirp": "1.0.4",
106106
"mocha": "10.3.0",
107-
"monocart-coverage-reports": "2.7.1",
107+
"monocart-coverage-reports": "2.7.4",
108108
"ms": "2.1.3",
109109
"openai": "3.2.1",
110110
"ora-classic": "5.4.2",

0 commit comments

Comments
 (0)