Skip to content

Commit 93c6b4b

Browse files
authored
ci: use wait-on in CircleCI pipeline (#1638)
1 parent 9aa2f45 commit 93c6b4b

File tree

4 files changed

+31
-7
lines changed

4 files changed

+31
-7
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ commands:
106106
steps:
107107
- cypress/run-tests:
108108
start-command: yarn start:ci
109-
cypress-command: yarn cypress run --ci-build-id=<<parameters.ciBuildId>> --group="<<parameters.group>>" --record --parallel --spec=<<parameters.specPattern>> --browser=<<parameters.browser>> --config '{"e2e":{"viewportWidth":375,"viewportHeight":667}}'
109+
cypress-command: yarn wait-on http://localhost:3001 && yarn cypress run --ci-build-id=<<parameters.ciBuildId>> --group="<<parameters.group>>" --record --parallel --spec=<<parameters.specPattern>> --browser=<<parameters.browser>> --config '{"e2e":{"viewportWidth":375,"viewportHeight":667}}'
110110
- when:
111111
condition:
112112
and:
@@ -120,15 +120,15 @@ commands:
120120
steps:
121121
- cypress/run-tests:
122122
start-command: yarn start:ci
123-
cypress-command: yarn percy exec -- yarn cypress run --ci-build-id=<<parameters.ciBuildId>> --group="<<parameters.group>>" --record --parallel --spec=<<parameters.specPattern>> --browser=<<parameters.browser>>
123+
cypress-command: yarn wait-on http://localhost:3001 && yarn percy exec -- yarn cypress run --ci-build-id=<<parameters.ciBuildId>> --group="<<parameters.group>>" --record --parallel --spec=<<parameters.specPattern>> --browser=<<parameters.browser>>
124124
- when:
125125
condition:
126126
and:
127127
- equal: [false, <<parameters.recordPercy>>]
128128
steps:
129129
- cypress/run-tests:
130130
start-command: yarn start:ci
131-
cypress-command: yarn cypress run --ci-build-id=<<parameters.ciBuildId>> --group="<<parameters.group>>" --record --parallel --spec=<<parameters.specPattern>> --browser=<<parameters.browser>>
131+
cypress-command: yarn wait-on http://localhost:3001 && yarn cypress run --ci-build-id=<<parameters.ciBuildId>> --group="<<parameters.group>>" --record --parallel --spec=<<parameters.specPattern>> --browser=<<parameters.browser>>
132132
- report-coverage
133133

134134
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Jobs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #

backend/app.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ if (process.env.VITE_GOOGLE) {
9595
app.use(checkGoogleJwt);
9696
}
9797

98+
app.get("/", (req, res) => {
99+
res.send("Cypress Realworld App - backend");
100+
});
98101
app.use("/graphql", gqlPlaygroundRoutes);
99102
app.use(
100103
"/graphql",

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@
135135
"vite": "^4.4.2",
136136
"vite-plugin-eslint": "^1.8.1",
137137
"vite-plugin-istanbul": "^4.1.0",
138-
"vitest": "^0.33.0"
138+
"vitest": "^0.33.0",
139+
"wait-on": "^8.0.3"
139140
},
140141
"scripts": {
141142
"dev": "cross-env NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch",

yarn.lock

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4885,6 +4885,15 @@ axios@^0.21.1:
48854885
dependencies:
48864886
follow-redirects "^1.14.0"
48874887

4888+
axios@^1.8.2:
4889+
version "1.9.0"
4890+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.9.0.tgz#25534e3b72b54540077d33046f77e3b8d7081901"
4891+
integrity sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==
4892+
dependencies:
4893+
follow-redirects "^1.15.6"
4894+
form-data "^4.0.0"
4895+
proxy-from-env "^1.1.0"
4896+
48884897
axobject-query@^4.1.0:
48894898
version "4.1.0"
48904899
resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
@@ -7164,7 +7173,7 @@ flatted@^3.2.9:
71647173
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27"
71657174
integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==
71667175

7167-
follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
7176+
follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0, follow-redirects@^1.15.6:
71687177
version "1.15.9"
71697178
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
71707179
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
@@ -8492,7 +8501,7 @@ jest-worker@^27.4.5:
84928501
merge-stream "^2.0.0"
84938502
supports-color "^8.0.0"
84948503

8495-
joi@^17.4.0:
8504+
joi@^17.13.3, joi@^17.4.0:
84968505
version "17.13.3"
84978506
resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
84988507
integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
@@ -11078,7 +11087,7 @@ rxjs@^7.1.0, rxjs@^7.8.1:
1107811087
dependencies:
1107911088
tslib "^2.1.0"
1108011089

11081-
rxjs@^7.5.1:
11090+
rxjs@^7.5.1, rxjs@^7.8.2:
1108211091
version "7.8.2"
1108311092
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
1108411093
integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
@@ -12615,6 +12624,17 @@ [email protected]:
1261512624
minimist "^1.2.5"
1261612625
rxjs "^7.1.0"
1261712626

12627+
wait-on@^8.0.3:
12628+
version "8.0.3"
12629+
resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-8.0.3.tgz#a23c684115d68059d739ce4eb18a3f88088d2d16"
12630+
integrity sha512-nQFqAFzZDeRxsu7S3C7LbuxslHhk+gnJZHyethuGKAn2IVleIbTB9I3vJSQiSR+DifUqmdzfPMoMPJfLqMF2vw==
12631+
dependencies:
12632+
axios "^1.8.2"
12633+
joi "^17.13.3"
12634+
lodash "^4.17.21"
12635+
minimist "^1.2.8"
12636+
rxjs "^7.8.2"
12637+
1261812638
walk-up-path@^3.0.1:
1261912639
version "3.0.1"
1262012640
resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-3.0.1.tgz#c8d78d5375b4966c717eb17ada73dbd41490e886"

0 commit comments

Comments
 (0)