Skip to content

Commit 5f8f5f9

Browse files
authored
fix(pd): remove cypress (#20207)
1 parent 5ea33d9 commit 5f8f5f9

40 files changed

+7
-5246
lines changed

.github/workflows/pd-test-build-deploy.yaml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -83,29 +83,12 @@ jobs:
8383
flags: protocol-designer
8484
token: ${{ secrets.CODECOV_TOKEN }}
8585

86-
e2e-test:
87-
name: 'protocol designer e2e tests'
88-
runs-on: 'ubuntu-24.04'
89-
timeout-minutes: 20
90-
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
91-
steps:
92-
- name: 'Checkout Repository'
93-
uses: actions/checkout@v4
94-
with:
95-
fetch-depth: 0 # PD needs to see labware in other release branches
96-
- uses: ./.github/actions/js/setup
97-
- name: 'run test-e2e'
98-
run: make -C protocol-designer test-e2e
99-
10086
build-pd:
10187
timeout-minutes: 20
10288
name: 'build protocol designer'
10389
needs:
10490
- determine-deploy-config
105-
- unit-test
106-
- e2e-test
10791
runs-on: 'ubuntu-24.04'
108-
if: always() && (needs.unit-test.result == 'success' || needs.unit-test.result == 'skipped') && (needs.e2e-test.result == 'success' || needs.e2e-test.result == 'skipped')
10992
steps:
11093
- uses: actions/checkout@v4
11194
with:
@@ -213,8 +196,8 @@ jobs:
213196
notify-success:
214197
name: 'Notify Build Success'
215198
runs-on: 'ubuntu-latest'
216-
needs: [unit-test, e2e-test, build-pd, deploy-pd]
217-
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && (needs.unit-test.result == 'success' || needs.unit-test.result == 'skipped') && (needs.e2e-test.result == 'success' || needs.e2e-test.result == 'skipped') && needs.build-pd.result == 'success' && needs.deploy-pd.result == 'success'
199+
needs: [unit-test, build-pd, deploy-pd]
200+
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && (needs.unit-test.result == 'success' || needs.unit-test.result == 'skipped') && needs.build-pd.result == 'success' && needs.deploy-pd.result == 'success'
218201
steps:
219202
- name: Checkout Repository
220203
uses: actions/checkout@v4
@@ -228,8 +211,8 @@ jobs:
228211
notify-failure:
229212
name: 'Notify Build Failure'
230213
runs-on: 'ubuntu-latest'
231-
needs: [unit-test, e2e-test, build-pd, deploy-pd]
232-
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && (needs.unit-test.result == 'failure' || needs.e2e-test.result == 'failure' || needs.build-pd.result == 'failure' || needs.deploy-pd.result == 'failure')
214+
needs: [unit-test, build-pd, deploy-pd]
215+
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && (needs.unit-test.result == 'failure' || needs.build-pd.result == 'failure' || needs.deploy-pd.result == 'failure')
233216
steps:
234217
- name: Checkout Repository
235218
uses: actions/checkout@v4
@@ -241,9 +224,6 @@ jobs:
241224
if [[ "${{ needs.unit-test.result }}" == "failure" ]]; then
242225
failed_jobs+=("unit-test")
243226
fi
244-
if [[ "${{ needs.e2e-test.result }}" == "failure" ]]; then
245-
failed_jobs+=("e2e-test")
246-
fi
247227
if [[ "${{ needs.build-pd.result }}" == "failure" ]]; then
248228
failed_jobs+=("build-pd")
249229
fi
@@ -265,8 +245,8 @@ jobs:
265245
notify-cancelled:
266246
name: 'Notify Build Cancelled'
267247
runs-on: 'ubuntu-latest'
268-
needs: [unit-test, e2e-test, build-pd, deploy-pd]
269-
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && (needs.unit-test.result == 'cancelled' || needs.e2e-test.result == 'cancelled' || needs.build-pd.result == 'cancelled' || needs.deploy-pd.result == 'cancelled')
248+
needs: [unit-test, build-pd, deploy-pd]
249+
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && (needs.unit-test.result == 'cancelled' || needs.build-pd.result == 'cancelled' || needs.deploy-pd.result == 'cancelled')
270250
steps:
271251
- name: Checkout Repository
272252
uses: actions/checkout@v4

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ test-windows: test-js test-py-windows
196196
.PHONY: test-e2e
197197
test-e2e:
198198
$(MAKE) -C $(LABWARE_LIBRARY_DIR) test-e2e
199-
$(MAKE) -C $(PROTOCOL_DESIGNER_DIR) test-e2e
200199

201200
PYTHON_TEST_TARGETS := $(addsuffix -py-test, $(PYTHON_DIRS))
202201
WINDOWS_PYTHON_TEST_TARGETS := $(addsuffix -py-test, $(HARDWARE_DIR) $(API_DIR) $(SHARED_DATA_DIR)/python)

protocol-designer/Makefile

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@ serve: export NODE_OPTIONS := --max-old-space-size=8192
6060
serve: all
6161
vite preview
6262

63-
# end to end tests
64-
.PHONY: test-e2e
65-
test-e2e: clean-downloads
66-
concurrently --kill-others --success first --names "protocol-designer-server,protocol-designer-tests" \
67-
"$(MAKE) dev" \
68-
"wait-on http://localhost:5178/ && cypress run --browser chrome --headless --record false --quiet"
69-
7063
.PHONY: test
7164
test:
7265
$(MAKE) -C .. test-js-protocol-designer tests="$(tests)" test_opts="$(test_opts)"
@@ -75,51 +68,6 @@ test:
7568
test-cov:
7669
make -C .. test-js-protocol-designer tests=$(tests) test_opts="$(test_opts)" cov_opts="$(cov_opts)"
7770

78-
CYPRESS_ESLINT_GLOB := cypress/**/*.ts cypress.config.ts
79-
CYPRESS_PRETTIER_GLOB := cypress/**/*.{ts,md,json} cypress.config.ts
80-
81-
.PHONY: cy-lint-check
82-
cy-lint-check: cy-lint-eslint-check cy-lint-prettier-check
83-
@echo "Cypress lint check completed."
84-
85-
.PHONY: cy-lint-fix
86-
cy-lint-fix: cy-lint-eslint-fix cy-lint-prettier-fix
87-
@echo "Cypress lint fix applied."
88-
89-
.PHONY: cy-lint-eslint-check
90-
cy-lint-eslint-check: clean-downloads clean-screenshots
91-
yarn eslint --ignore-path ../.eslintignore $(CYPRESS_ESLINT_GLOB)
92-
@echo "Cypress ESLint check completed."
93-
94-
.PHONY: cy-lint-eslint-fix
95-
cy-lint-eslint-fix: clean-downloads clean-screenshots
96-
yarn eslint --fix --ignore-pattern ../.eslintignore $(CYPRESS_ESLINT_GLOB)
97-
@echo "Cypress ESLint fix applied."
98-
99-
.PHONY: cy-lint-prettier-check
100-
cy-lint-prettier-check: clean-downloads clean-screenshots
101-
yarn prettier --ignore-path ../.eslintignore --check $(CYPRESS_PRETTIER_GLOB)
102-
@echo "Cypress Prettier check completed."
103-
104-
.PHONY: cy-lint-prettier-fix
105-
cy-lint-prettier-fix: clean-downloads clean-screenshots
106-
yarn prettier --ignore-path ../.eslintignore --write $(CYPRESS_PRETTIER_GLOB)
107-
@echo "Cypress Prettier fix applied."
108-
109-
.PHONY: cy-ui
110-
cy-ui:
111-
@echo "Running Cypress UI"
112-
@echo "Dev environment must be running"
113-
yarn cypress open
114-
115-
.PHONY: clean-downloads
116-
clean-downloads:
117-
shx rm -rf cypress/downloads
118-
119-
.PHONY: clean-screenshots
120-
clean-screenshots:
121-
shx rm -rf cypress/screenshots
122-
12371
# analyze bundle
12472
.PHONY: bundle-analyzer
12573
bundle-analyzer:

protocol-designer/cypress.config.ts

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

protocol-designer/cypress/README.md

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

protocol-designer/cypress/e2e/batchEdit.cy.ts

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

protocol-designer/cypress/e2e/createNew.cy.ts

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

protocol-designer/cypress/e2e/createNewFlex.cy.ts

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

protocol-designer/cypress/e2e/home.cy.ts

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

0 commit comments

Comments
 (0)