Skip to content

Commit 51dab28

Browse files
authored
Merge pull request #2164 from rubocop/ci-test-rspec-4-on-its-main-branch
CI: Test RSpec 4 prerelease on rspec main branch
2 parents 33f7949 + a3d26bd commit 51dab28

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
@@ -108,15 +108,15 @@ jobs:
108108
name: RSpec 4
109109
steps:
110110
- uses: actions/checkout@v6
111-
- name: Use latest RSpec 4 from `4-0-dev` branch
111+
- name: Use latest RSpec 4 from `main` branch
112112
run: |
113113
sed -e '/rspec/d' -i Gemfile
114114
cat << EOF > Gemfile.local
115-
gem 'rspec', github: 'rspec/rspec', branch: '4-0-dev'
116-
gem 'rspec-core', github: 'rspec/rspec', branch: '4-0-dev'
117-
gem 'rspec-expectations', github: 'rspec/rspec', branch: '4-0-dev'
118-
gem 'rspec-mocks', github: 'rspec/rspec', branch: '4-0-dev'
119-
gem 'rspec-support', github: 'rspec/rspec', branch: '4-0-dev'
115+
gem 'rspec', github: 'rspec/rspec', branch: 'main'
116+
gem 'rspec-core', github: 'rspec/rspec', branch: 'main'
117+
gem 'rspec-expectations', github: 'rspec/rspec', branch: 'main'
118+
gem 'rspec-mocks', github: 'rspec/rspec', branch: 'main'
119+
gem 'rspec-support', github: 'rspec/rspec', branch: 'main'
120120
EOF
121121
- uses: ruby/setup-ruby@v1
122122
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)