Skip to content

Commit 15d4d42

Browse files
jan-goraljan-goral
authored
Merge branch 'master' into 743-modify-ascii-doc
2 parents 9dd61f0 + 6188af2 commit 15d4d42

39 files changed

Lines changed: 6772 additions & 23356 deletions

‎README.md‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,20 @@ gcloud:
8080
## Invoke a test asynchronously without waiting for test results.
8181
# async: false
8282

83+
## A key-value map of additional details to attach to the test matrix.
84+
## Arbitrary key-value pairs may be attached to a test matrix to provide additional context about the tests being run.
85+
## When consuming the test results, such as in Cloud Functions or a CI system,
86+
## these details can add additional context such as a link to the corresponding pull request.
87+
# client-details
88+
# key1: value1
89+
# key2: value2
90+
91+
## The name of the network traffic profile, for example LTE, HSPA, etc,
92+
## which consists of a set of parameters to emulate network conditions when running the test
93+
## (default: no network shaping; see available profiles listed by the `flank test network-profiles list` command).
94+
## This feature only works on physical devices.
95+
# network-profile: LTE
96+
8397
## The history name for your test results (an arbitrary string label; default: the application's label from the APK manifest).
8498
## All tests which use the same history name will have their results grouped together in the Firebase console in a time-ordered test history list.
8599
# results-history-name: android-history
@@ -94,14 +108,14 @@ gcloud:
94108
## The path to the test package (a zip file containing the iOS app and XCTest files).
95109
## The given path may be in the local filesystem or in Google Cloud Storage using a URL beginning with gs://.
96110
## Note: any .xctestrun file in this zip file will be ignored if --xctestrun-file is specified.
97-
test: ./src/test/kotlin/ftl/fixtures/tmp/EarlGreyExample.zip
111+
test: ./src/test/kotlin/ftl/fixtures/tmp/earlgrey_example.zip
98112

99113
## The path to an .xctestrun file that will override any .xctestrun file contained in the --test package.
100114
## Because the .xctestrun file contains environment variables along with test methods to run and/or ignore,
101115
## this can be useful for customizing or sharding test suites. The given path should be in the local filesystem.
102116
## Note: this path should usually be pointing to the xctestrun file within the derived data folder
103117
## For example ./derivedDataPath/Build/Products/EarlGreyExampleSwiftTests_iphoneos13.4-arm64e.xctestrun
104-
xctestrun-file: ./src/test/kotlin/ftl/fixtures/tmp/EarlGreyExampleSwiftTests_iphoneos12.1-arm64e.xctestrun
118+
xctestrun-file: ./src/test/kotlin/ftl/fixtures/tmp/EarlGreyExampleSwiftTests_iphoneos13.4-arm64e.xctestrun
105119

106120
## The version of Xcode that should be used to run an XCTest.
107121
## Defaults to the latest Xcode version supported in Firebase Test Lab.
@@ -134,7 +148,7 @@ flank:
134148
## default: -1 (unlimited)
135149
# shard-time: -1
136150

137-
## repeat tests - the amount of times to run the tests.
151+
## test runs - the amount of times to run the tests.
138152
## 1 runs the tests once. 10 runs all the tests 10x
139153
# num-test-runs: 1
140154

@@ -169,8 +183,11 @@ flank:
169183
## Local folder to store the test result. Folder is DELETED before each run to ensure only artifacts from the new run are saved.
170184
# local-result-dir: flank
171185

186+
## The max time this test run can execute before it is cancelled (default: unlimited).
187+
# run-timeout: 60m
188+
172189
## Keeps the full path of downloaded files. Required when file names are not unique.
173-
## Default: false
190+
## Default: false
174191
# keep-file-path: false
175192

176193
## The max time this test run can execute before it is cancelled (default: unlimited).
@@ -343,7 +360,7 @@ flank:
343360
## default: -1 (unlimited)
344361
# shard-time: -1
345362

346-
## The amount of times to run the tests.
363+
## test runs - the amount of times to run the tests.
347364
## 1 runs the tests once. 10 runs all the tests 10x
348365
# num-test-runs: 1
349366

@@ -373,7 +390,7 @@ flank:
373390
# local-result-dir: flank
374391

375392
## Keeps the full path of downloaded files. Required when file names are not unique.
376-
## Default: false
393+
## Default: false
377394
# keep-file-path: false
378395

379396
## Include additional app/test apk pairs in the run. Apks are unique by just filename and not by path!

‎junit_html_report/.editorconfig‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
end_of_line = lf
8+
insert_final_newline = true
9+
indent_style = space
10+
indent_size = 2
11+
trim_trailing_whitespace = true
12+
13+
[*.md]
14+
trim_trailing_whitespace = false

‎junit_html_report/.gitignore‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2-
3-
# dependencies
4-
/node_modules
5-
/.pnp
6-
.pnp.js
7-
8-
# testing
9-
/coverage
10-
11-
# production
12-
/build
13-
14-
# misc
15-
.DS_Store
16-
.env.local
17-
.env.development.local
18-
.env.test.local
19-
.env.production.local
20-
21-
npm-debug.log*
22-
yarn-debug.log*
23-
yarn-error.log*
1+
build
2+
node_modules
3+
.idea

‎junit_html_report/README.md‎

Lines changed: 9 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,12 @@
1-
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
1+
jUnit HTML report
2+
=================
23

3-
## Contributing
4+
# One time setup
5+
- install Node (any reasonably modern version will do as long as it comes with NPM)
6+
- run `npm` or `yarn` (if you use Yarn)
47

5-
Install [Visual Studio Code](https://code.visualstudio.com/)
8+
# To build a static HTML/CSS app
9+
- run `npm run build` or `yarn build` - this will transpile/bundle/minify a simple JS app and inline it into an HTML file (`../test_runner/src/main/resources/inline.html`)
610

7-
Install node
8-
- `brew install node`
9-
10-
Install yarn
11-
- `brew install yarn`
12-
13-
Install deps
14-
- `yarn`
15-
16-
Run locally
17-
- `yarn start`
18-
19-
Create inline.html to bundle in the flank jar
20-
- `./update_report.sh`
21-
22-
## Available Scripts
23-
24-
In the project directory, you can run:
25-
26-
### `npm start`
27-
28-
Runs the app in the development mode.<br>
29-
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
30-
31-
The page will reload if you make edits.<br>
32-
You will also see any lint errors in the console.
33-
34-
### `npm test`
35-
36-
Launches the test runner in the interactive watch mode.<br>
37-
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
38-
39-
### `npm run build`
40-
41-
Builds the app for production to the `build` folder.<br>
42-
It correctly bundles React in production mode and optimizes the build for the best performance.
43-
44-
The build is minified and the filenames include the hashes.<br>
45-
Your app is ready to be deployed!
46-
47-
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
48-
49-
### `npm run eject`
50-
51-
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
52-
53-
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
54-
55-
Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
56-
57-
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
58-
59-
## Learn More
60-
61-
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
62-
63-
To learn React, check out the [React documentation](https://reactjs.org/).
11+
# To spin up a dev server
12+
- run `npm run start` or `yarn start` - this should serve the app with test data and reload whenever source files change.

‎junit_html_report/index.ejs‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<!doctype html>
2+
<meta charset="UTF-8">
3+
<title><%= htmlWebpackPlugin.options.title %></title>
4+
<svg style="display: none">
5+
<defs>
6+
<symbol id="icon-chevron" viewBox="0 0 7 12">
7+
<path d="M0.756683 0.675335L6.03278 5.95143L0.756683 11.2275" stroke-width="0.5" />
8+
</symbol>
9+
</defs>
10+
</svg>
11+
<div id="results"></div>
12+
13+
<% if (htmlWebpackPlugin.options.inlineBundle) { %>
14+
<script>
15+
window.resultData = "INJECT-DATA-HERE";
16+
</script>
17+
<script>
18+
<%= compilation.getAsset('bundle.js').source._value %>
19+
</script>
20+
<% } else { %>
21+
<script>
22+
// NOTE: Test data - does not get inlined.
23+
window.resultData = `
24+
[
25+
{
26+
"label": "First group",
27+
"items": [
28+
{
29+
"label": "First item",
30+
"url": "foo"
31+
},
32+
{
33+
"label": "Second item",
34+
"url": "bar"
35+
}
36+
]
37+
},
38+
{
39+
"label": "Second group",
40+
"items": [
41+
{
42+
"label": "First item of the second group",
43+
"url": "baz"
44+
}
45+
]
46+
}
47+
]
48+
`;
49+
</script>
50+
<script src="bundle.js"></script>
51+
<% } %>
52+

‎junit_html_report/inline.js‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)