Skip to content

Commit 40e62bf

Browse files
authored
Add ruby 3.3 to edge and test flows (#2397)
* Add ruby 3.3 to edge and test flows Update actions/checkout to v4 Remove a spec not related to endpoint method missing * Add CHANGELOG.md entry * Revert docker-compose
1 parent 91eec1a commit 40e62bf

File tree

6 files changed

+10
-20
lines changed

6 files changed

+10
-20
lines changed

.github/workflows/danger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
danger:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010
with:
1111
fetch-depth: 100
1212
- name: Set up Ruby

.github/workflows/edge.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
ruby: ['2.7', '3.0', '3.1', '3.2', ruby-head, truffleruby-head, jruby-head]
9+
ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', ruby-head, truffleruby-head, jruby-head]
1010
gemfile: [rails_edge, rack_edge, rack_3_0]
1111
runs-on: ubuntu-latest
1212
continue-on-error: true
1313
env:
1414
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717

1818
- name: Set up Ruby
1919
uses: ruby/setup-ruby@v1

.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
name: RuboCop
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111

1212
- name: Set up Ruby
1313
uses: ruby/setup-ruby@v1
1414
with:
15-
ruby-version: 3.2
15+
ruby-version: 3.3
1616
bundler-cache: true
1717
rubygems: latest
1818

@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
ruby: ['2.7', '3.0', '3.1', '3.2']
26+
ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
2727
gemfile: [rack_2_0, rack_3_0, rails_6_0, rails_6_1, rails_7_0, rails_7_1]
2828
include:
2929
- ruby: '2.7'
@@ -36,7 +36,7 @@ jobs:
3636
env:
3737
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040

4141
- name: Set up Ruby
4242
uses: ruby/setup-ruby@v1

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* [#2390](https://github.com/ruby-grape/grape/pull/2390): Drop support for Ruby 2.6 and Rails 5 - [@ericproulx](https://github.com/ericproulx).
1111
* [#2393](https://github.com/ruby-grape/grape/pull/2393): Optimize AttributeTranslator - [@ericproulx](https://github.com/ericproulx).
1212
* [#2395](https://github.com/ruby-grape/grape/pull/2395): Set `max-age` to 0 when `cookies.delete` - [@ericproulx](https://github.com/ericproulx).
13+
* [#2397](https://github.com/ruby-grape/grape/pull/2397): Add support for ruby 3.3 - [@ericproulx](https://github.com/ericproulx).
1314
* [#2399](https://github.com/ruby-grape/grape/pull/2399): Update `rubocop` to 1.59.0, `rubocop-performance` to 1.20.1 and `rubocop-rspec` to 2.25.0 - [@ericproulx](https://github.com/ericproulx).
1415
* Your contribution here.
1516

@@ -63,7 +64,7 @@
6364

6465
#### Features
6566

66-
* [#2288](https://github.com/ruby-grape/grape/pull/2288): Droped support for Ruby 2.5 - [@ericproulx](https://github.com/ericproulx).
67+
* [#2288](https://github.com/ruby-grape/grape/pull/2288): Dropped support for Ruby 2.5 - [@ericproulx](https://github.com/ericproulx).
6768
* [#2288](https://github.com/ruby-grape/grape/pull/2288): Updated rubocop to 1.41.0 - [@ericproulx](https://github.com/ericproulx).
6869
* [#2296](https://github.com/ruby-grape/grape/pull/2296): Fix cops and enables some - [@ericproulx](https://github.com/ericproulx).
6970
* [#2302](https://github.com/ruby-grape/grape/pull/2302): Rack < 3 and update rack-test - [@ericproulx](https://github.com/ericproulx).

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ services:
1414
tty: true
1515
volumes:
1616
- .:/var/grape
17-
- gems:/usr/local/bundle
17+
- gems:/usr/local/bundle

spec/grape/endpoint_spec.rb

-11
Original file line numberDiff line numberDiff line change
@@ -694,17 +694,6 @@ def app
694694
end.to raise_error(NoMethodError, %r{^undefined method `undefined_helper' for #<Class:0x[0-9a-fA-F]+> in `/hey' endpoint})
695695
end
696696
end
697-
698-
context 'when performing an undefined method of an instance inside the API' do
699-
it 'raises NoMethodError but stripping the internals of the Object class' do
700-
subject.get('/hey') do
701-
Object.new.x
702-
end
703-
expect do
704-
get '/hey'
705-
end.to raise_error(NoMethodError, /^undefined method `x' for #<Object:0x[0-9a-fA-F]+>$/)
706-
end
707-
end
708697
end
709698

710699
it 'does not persist params between calls' do

0 commit comments

Comments
 (0)