Skip to content

Commit 5641749

Browse files
authored
Merge pull request #91 from rubocop/ci-test-rspec-4-on-its-main-branch
CI: Test RSpec 4 prerelease on rspec main branch
2 parents 1b89ec3 + a9b102f commit 5641749

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ jobs:
103103
name: RSpec 4
104104
steps:
105105
- uses: actions/checkout@v6
106-
- name: Use latest RSpec 4 from `4-0-dev` branch
106+
- name: Use latest RSpec 4 from `main` branch
107107
run: |
108108
sed -e "/^gem 'rspec/d" -i Gemfile
109109
cat << EOF > Gemfile.local
110-
gem 'rspec', github: 'rspec/rspec', branch: '4-0-dev'
111-
gem 'rspec-core', github: 'rspec/rspec', branch: '4-0-dev'
112-
gem 'rspec-expectations', github: 'rspec/rspec', branch: '4-0-dev'
113-
gem 'rspec-mocks', github: 'rspec/rspec', branch: '4-0-dev'
114-
gem 'rspec-support', github: 'rspec/rspec', branch: '4-0-dev'
110+
gem 'rspec', github: 'rspec/rspec', branch: 'main'
111+
gem 'rspec-core', github: 'rspec/rspec', branch: 'main'
112+
gem 'rspec-expectations', github: 'rspec/rspec', branch: 'main'
113+
gem 'rspec-mocks', github: 'rspec/rspec', branch: 'main'
114+
gem 'rspec-support', github: 'rspec/rspec', branch: 'main'
115115
EOF
116116
- uses: ruby/setup-ruby@v1
117117
with:

spec/smoke_tests/weird_rspec_spec.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,14 @@
8080

8181
context 'test' do
8282
include_examples 'weird rspec'
83-
include_examples('weird rspec', serious: true) do
84-
it_behaves_like :something
83+
if RSpec::Core::Version::STRING < '4.0'
84+
include_examples('weird rspec', serious: true) do
85+
it_behaves_like :something
86+
end
87+
else
88+
it_behaves_like('weird rspec', serious: true) do
89+
it_behaves_like :something
90+
end
8591
end
8692
end
8793

0 commit comments

Comments
 (0)