Skip to content

Commit 37af6a1

Browse files
committed
Merge branch 'master' into update-e2e-specs-setup-2
# Conflicts: # .github/workflows/ruby.yml # specs_e2e/rails_6_1/config/initializers/inflections.rb # specs_e2e/rails_6_1/config/initializers/mime_types.rb
2 parents c96a995 + 885508e commit 37af6a1

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

.github/workflows/ruby.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,3 @@ jobs:
4242
run: ./specs_e2e/rails_7_2/test.sh
4343
env:
4444
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
45-
46-
rails_5_2:
47-
runs-on: ubuntu-latest
48-
49-
steps:
50-
- uses: actions/checkout@v4
51-
- name: Set up Ruby
52-
uses: ruby/setup-ruby@v1
53-
with:
54-
ruby-version: 2.6
55-
bundler-cache: true
56-
- name: Run tests
57-
run: bundle exec rake
58-
- name: Run interaction tests
59-
run: ./specs_e2e/rails_5_2/test.sh
60-
env:
61-
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CypressOnRails
1+
# Cypress and Playwright on Rails
22

33
![Build Status](https://github.com/shakacode/cypress-on-rails/actions/workflows/ruby.yml/badge.svg)
44
[![cypress-on-rails](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/2b6cjr/master&style=plastic&logo=cypress)](https://dashboard.cypress.io/projects/2b6cjr/runs)

0 commit comments

Comments
 (0)