Skip to content

Commit f343cde

Browse files
Merge branch 'main' into cloud-apm-deprecated
2 parents 889838a + 5746f29 commit f343cde

File tree

21 files changed

+507
-282
lines changed

21 files changed

+507
-282
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ src/data/markdown/docs/40 xk6-disruptor/04 Examples/02 Inject HTTP faults into P
1111
src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/100 Test-for-functional-behavior.md
1212
src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/200 Test for performance.md
1313
src/data/markdown/docs/05 Examples/02 Tutorials/01 Get started with k6/400 Reuse and re-run tests.md
14-

.vale/Vocab/docs/accept.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ Capitan
6363
charset
6464
contentful
6565
corejs
66+
croc
67+
crocs
6668
cron
6769
crypto
6870
Ctrl

gatsby-node.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ function getDocPagesProps({
674674
slug = `javascript-api/${slug}`;
675675
if (slug.includes('xk6-disruptor/get-started/welcome')) {
676676
// make the section root out of the welcome page
677-
slug = `javascript-api/xk6-disruptor/`;
677+
slug = `/javascript-api/xk6-disruptor/`;
678678
}
679679

680680
replacePathsInSidebarTree(
@@ -1693,6 +1693,11 @@ const createRedirects = ({ actions }) => {
16931693
toPath: '/testing-guides/automated-performance-testing/',
16941694
isPermanent: true,
16951695
});
1696+
createRedirect({
1697+
fromPath: '/examples/advanced-api-flow/',
1698+
toPath: '/examples/api-crud-operations/',
1699+
isPermanent: true,
1700+
});
16961701

16971702
const redirects = {
16981703
'/javascript-api/k6-http/cookiejar-k6-http/':
@@ -1855,6 +1860,8 @@ const createRedirects = ({ actions }) => {
18551860
'/using-k6-browser/selecting-elements/',
18561861
'/javascript-api/k6-browser/get-started/selecting-elements/':
18571862
'/using-k6-browser/selecting-elements/',
1863+
'/javascript-api/xk6-disruptor/get-started/welcome/':
1864+
'/javascript-api/xk6-disruptor/',
18581865
...newJavascriptURLsRedirects,
18591866
};
18601867

src/data/doc-examples/links.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
"to": "/examples/data-uploads"
5656
},
5757
{
58-
"title": "Advanced API example",
59-
"description": "This example covers the usage of different k6 APIs for API load testing.",
58+
"title": "API CRUD Operations",
59+
"description": "This example covers the usage of different k6 APIs for API CRUD operations testing.",
6060
"url": "",
61-
"to": "/examples/advanced-api-flow"
61+
"to": "/examples/api-crud-operations"
6262
},
6363
{
6464
"title": "Generating UUIDs",
@@ -201,4 +201,4 @@
201201
"url": "https://k6.io/blog/extending-k6-with-xk6"
202202
}
203203
]
204-
}
204+
}

src/data/markdown/docs/03 cloud/01 Creating and running a test/300 Cloud scripting extras/100 Cloud options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const options = {
3535
| Name | Default | Description |
3636
|-------------------------------|----------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
3737
| name (string) | The name of the main script file, so something like `script.js`. | The name of the test in the k6 Cloud UI. Test runs with the same name will be grouped together. |
38-
| projectID (number) | It is empty by default. | The ID of the project to which the test is assigned in the k6 Cloud UI. That's in the default project of the user's default organization. |
38+
| projectID (number) | Empty by default. | The ID of the project to which the test is assigned in the k6 Cloud UI. That's in the default project of the user's default organization. |
3939
| distribution (object) | The equivalent of `someDefaultLabel: { loadZone: "amazon:us:ashburn", percent: 100 }`. | How the traffic should be distributed across existing [Load Zones](/cloud/creating-and-running-a-test/cloud-scripting-extras/cloud-options/). The keys are string labels that will be injected as [environment variables](/cloud/creating-and-running-a-test/cloud-scripting-extras/cloud-environment-variables). |
4040
| staticIPs (boolean) | `false` by default | When set to `true` the cloud system will use dedicated IPs assigned to your organization to execute the test. |
4141
| note (string) | Empty by default. | Notes regarding the test, changes made, or anything that may be worth noting about your test. |

src/data/markdown/docs/05 Examples/01 Examples/10 advanced-api-flow.md

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

0 commit comments

Comments
 (0)