Skip to content

Commit

Permalink
chore: various cleanups
Browse files Browse the repository at this point in the history
- Upgrade e2e version of cypres to 13.6.6
- Run prettier
- Set test timeouts to short
- Disable cypress lifecycle for cypress
  • Loading branch information
mrmeku committed May 1, 2024
1 parent 6e9bd95 commit 8c4760b
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 31 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ bazel-*
.idea/
.ijwb/
node_modules
.github/pull_request_template.md

# Don't commit lockfile for now as it is unstable. Do allow for it to be
# created, however, since it gives a performance boost for local development.
Expand Down
12 changes: 7 additions & 5 deletions e2e/workspace/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
bazel_dep(name = "aspect_rules_cypress", version = "0.0.0", dev_dependency = True)
bazel_dep(name = "aspect_rules_cypress")
local_path_override(
module_name = "aspect_rules_cypress",
path = "../..",
)

cypress = use_extension("@aspect_rules_cypress//cypress:extensions.bzl", "cypress", dev_dependency = True)
cypress.toolchain(cypress_version = "12.12.0")
cypress = use_extension("@aspect_rules_cypress//cypress:extensions.bzl", "cypress")
cypress.toolchain(cypress_version = "13.6.6")
use_repo(cypress, "cypress_toolchains")

register_toolchains("@cypress_toolchains//:all")

bazel_dep(name = "aspect_rules_js", version = "1.41.2", dev_dependency = True)
Expand All @@ -16,6 +14,10 @@ bazel_dep(name = "bazel_features", version = "1.9.0", dev_dependency = True)
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
npm.npm_translate_lock(
name = "npm",
lifecycle_hooks_exclude = [
# Speed up installation by disabling cypress binary install. Optional.
"cypress",
],
pnpm_lock = "//:pnpm-lock.yaml",
verify_node_modules_ignored = "//:.bazelignore",
)
Expand Down
6 changes: 5 additions & 1 deletion e2e/workspace/WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ load("@aspect_rules_cypress//cypress:repositories.bzl", "cypress_register_toolch

cypress_register_toolchains(
name = "cypress",
cypress_version = "12.12.0",
cypress_version = "13.6.6",
)

load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
Expand All @@ -44,6 +44,10 @@ load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")

npm_translate_lock(
name = "npm",
lifecycle_hooks_exclude = [
# Speed up installation by disabling cypress binary install. Optional.
"cypress",
],
pnpm_lock = "//:pnpm-lock.yaml",
verify_node_modules_ignored = "//:.bazelignore",
)
Expand Down
1 change: 1 addition & 0 deletions e2e/workspace/cli_test/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ load("@aspect_rules_cypress//cypress:defs.bzl", "cypress_test")

cypress_test(
name = "cli_test",
timeout = "short",
args = [
"run",
"--config-file=cypress.config.ts",
Expand Down
12 changes: 6 additions & 6 deletions e2e/workspace/cli_test/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { defineConfig } from 'cypress'
import { defineConfig } from "cypress";

export default defineConfig({
e2e: {
specPattern: ["cli_test.cy.ts"],
supportFile: false,
setupNodeEvents(on, config) {
on('before:browser:launch', (browser, launchOptions) => {
launchOptions.args.push("--disable-gpu-shader-disk-cache")
})
}
on("before:browser:launch", (browser, launchOptions) => {
launchOptions.args.push("--disable-gpu-shader-disk-cache");
});
},
},
})
});
1 change: 1 addition & 0 deletions e2e/workspace/module_test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ load("@aspect_rules_cypress//cypress:defs.bzl", "cypress_module_test")

cypress_module_test(
name = "module_test",
timeout = "short",
data = [
"cypress.config.js",
"module_test.cy.js",
Expand Down
14 changes: 7 additions & 7 deletions e2e/workspace/module_test/cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
const { defineConfig } = require('cypress')
const { defineConfig } = require("cypress");

module.exports = defineConfig({
e2e: {
specPattern: ["*.cy.js"],
supportFile: false,
setupNodeEvents(on, config) {
on('before:browser:launch', (browser = {}, launchOptions) => {
launchOptions.args.push("--disable-gpu-shader-disk-cache")
})
}
setupNodeEvents(on, _config) {
on("before:browser:launch", (_browser, launchOptions) => {
launchOptions.args.push("--disable-gpu-shader-disk-cache");
});
},
},
})
});
2 changes: 1 addition & 1 deletion e2e/workspace/module_test/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ async function main() {
return 1;
}

if (result.status !== "finished") {
if (result.status === "failed") {
console.error("Cypress tests failed with status", result.status);
return 2;
}
Expand Down
4 changes: 2 additions & 2 deletions e2e/workspace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0.0",
"description": "Tests for cypress bazel rules",
"dependencies": {
"cypress": "12.12.0",
"cypress": "13.6.6",
"express": "^4.19.2",
"typescript": "4.9.5"
}
}
}
25 changes: 16 additions & 9 deletions e2e/workspace/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions e2e/workspace/server_example/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ js_binary(

cypress_test(
name = "server_example",
timeout = "short",
args = [
"run",
"--config-file=cypress.config.js",
Expand Down

0 comments on commit 8c4760b

Please sign in to comment.