diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 081177a..e652cba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.1' + ruby-version: '3.2' bundler-cache: true - name: Run rubocop run: bundle exec rubocop --parallel --format progress @@ -28,8 +28,8 @@ jobs: needs: ['rubocop'] strategy: matrix: - ruby-version: ['2.7', '3.0', '3.1', 'head'] - grape-version: [1.6.2, 1.5.3] + ruby-version: ['3.0', '3.1', '3.2', 'head'] + grape-version: [1.6.2, 1.7.0] model-parser: [grape-swagger-entity, grape-swagger-representable, ''] steps: - name: Check out branch diff --git a/.rubocop.yml b/.rubocop.yml index 0596d78..1893914 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,7 +5,7 @@ AllCops: - vendor/**/* - example/**/* NewCops: enable - TargetRubyVersion: 3.1 + TargetRubyVersion: 3.2 SuggestExtensions: false # Layout stuff diff --git a/.ruby-gemset b/.ruby-gemset deleted file mode 100644 index b2170da..0000000 --- a/.ruby-gemset +++ /dev/null @@ -1 +0,0 @@ -grape-swagger diff --git a/Gemfile b/Gemfile index 7c7c6ba..c6e99aa 100644 --- a/Gemfile +++ b/Gemfile @@ -2,11 +2,9 @@ source 'http://rubygems.org' -ruby RUBY_VERSION - gemspec -gem 'grape', case version = ENV.fetch('GRAPE_VERSION', '~> 1.6') +gem 'grape', case version = ENV.fetch('GRAPE_VERSION', '~> 1.7') when 'HEAD' { git: 'https://github.com/ruby-grape/grape' } else diff --git a/spec/lib/oapi_tasks_spec.rb b/spec/lib/oapi_tasks_spec.rb index 733854f..38bdca7 100644 --- a/spec/lib/oapi_tasks_spec.rb +++ b/spec/lib/oapi_tasks_spec.rb @@ -30,7 +30,7 @@ RSpec.describe GrapeSwagger::Rake::OapiTasks do describe '.new' do it 'accepts class name as a constant' do - expect(described_class.new(::Api::Base).send(:api_class)).to eq(Api::Base) + expect(described_class.new(Api::Base).send(:api_class)).to eq(Api::Base) end it 'accepts class name as a string' do diff --git a/spec/swagger_v2/api_documentation_spec.rb b/spec/swagger_v2/api_documentation_spec.rb index ac59f1f..0404d7a 100644 --- a/spec/swagger_v2/api_documentation_spec.rb +++ b/spec/swagger_v2/api_documentation_spec.rb @@ -21,21 +21,7 @@ describe 'API with additional options' do expect(subject).to eq( [ { description: 'Swagger compatible API description' }, - { - description: 'Swagger compatible API description for specific API', - params: { - 'locale' => { - desc: 'Locale of API documentation', - required: false, - type: 'Symbol' - }, - 'name' => { - desc: 'Resource name of mounted API', - required: true, - type: 'String' - } - } - } + { description: 'Swagger compatible API description for specific API', params: {} } ] ) end