Skip to content

Commit a3591b3

Browse files
committed
Add test matrix
1 parent 6a43c13 commit a3591b3

File tree

5 files changed

+33
-41
lines changed

5 files changed

+33
-41
lines changed

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Ruby
1313
uses: ruby/setup-ruby@v1
1414
with:
15-
ruby-version: "2.5.6"
15+
ruby-version: "2.7"
1616
bundler-cache: true
1717
- name: Run Danger
1818
run: |

.github/workflows/test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Tests
2-
on:
2+
on:
33
push:
44
branches:
55
- master
@@ -12,15 +12,15 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
grape-swagger:
15-
- { version: "0.8.0", experimental: false }
16-
- { version: "0.9.0", experimental: false }
17-
- { version: "0.11.0", experimental: false }
18-
- { version: "0.20.2", experimental: false }
19-
- { version: "0.33.0", experimental: false }
15+
- { version: "1.6.0", experimental: false }
2016
- { version: "HEAD", experimental: true }
2117
ruby:
22-
- { version: "2.5.6", experimental: false }
18+
- { version: "2.7", experimental: false }
19+
- { version: "3.0", experimental: false }
20+
- { version: "3.1", experimental: false }
21+
- { version: "3.2", experimental: false }
2322
- { version: "ruby-head", experimental: true }
23+
- { version: "jruby-9.4.2", experimental: false }
2424
- { version: "jruby-head", experimental: true }
2525
env:
2626
GRAPE_SWAGGER_VERSION: ${{ matrix.grape-swagger.version }}
@@ -34,10 +34,10 @@ jobs:
3434
- name: Setup Firefox
3535
uses: browser-actions/setup-firefox@v1
3636
with:
37-
firefox-version: "54.0"
37+
firefox-version: "111.0.1"
3838
- uses: browser-actions/setup-geckodriver@latest
3939
with:
40-
geckodriver-version: "0.18.0"
41-
- uses: GabrielBB/xvfb-action@v1
40+
geckodriver-version: "0.32.2"
41+
- uses: coactions/setup-xvfb@v1
4242
with:
4343
run: bundle exec rake spec

Gemfile

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,32 @@ source 'https://rubygems.org'
22

33
gemspec
44

5-
case version = ENV['GRAPE_SWAGGER_VERSION'] || '~> 0.9.0'
5+
case version = ENV['GRAPE_SWAGGER_VERSION'] || '~> 1.6.0'
66
when 'HEAD'
77
gem 'grape-swagger', github: 'ruby-grape/grape-swagger'
8-
when '0.8.0'
9-
gem 'grape', '0.9.0'
10-
gem 'grape-swagger', '0.8.0'
11-
when '0.9.0'
12-
gem 'grape', '0.10.1'
13-
gem 'grape-swagger', '0.9.0'
14-
when '0.11.0'
15-
gem 'grape', '0.16.2'
16-
gem 'grape-swagger', '0.11.0'
17-
when '0.20.2'
18-
gem 'grape', '0.14.0'
19-
gem 'grape-swagger', '0.20.2'
208
else
219
gem 'grape-swagger', version
10+
gem 'grape', '>= 1.3.0'
2211
end
2312

2413
group :development, :test do
25-
gem 'ruby-grape-danger', '~> 0.2.0', require: false
26-
gem 'rake'
27-
gem 'rspec-rails'
2814
gem 'capybara'
29-
gem 'selenium-webdriver'
30-
gem 'sass'
31-
gem 'sass-rails'
32-
gem 'uglifier'
3315
gem 'coffee-rails'
34-
gem 'jquery-rails'
3516
gem 'grape-swagger-ui'
36-
gem 'sprockets'
37-
gem 'rack', '~> 1.6'
17+
gem 'jquery-rails'
18+
gem 'mime-types'
19+
gem 'nokogiri'
20+
gem 'rack', '< 3.0'
3821
gem 'rack-cors'
39-
gem 'rubocop', '0.77.0'
40-
gem 'mime-types', '< 3.0'
4122
gem 'rack-no_animations'
42-
gem 'nokogiri'
23+
gem 'rake'
24+
gem 'rspec-rails'
25+
gem 'rubocop', '0.77.0'
26+
gem 'ruby-grape-danger', '~> 0.2.0', require: false
27+
gem 'sass'
28+
gem 'sass-rails'
29+
gem 'selenium-webdriver'
30+
gem 'sprockets'
31+
gem 'uglifier'
32+
gem 'webrick'
4333
end

grape-swagger-rails.gemspec

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# coding: utf-8
2-
lib = File.expand_path('../lib', __FILE__)
1+
lib = File.expand_path('lib', __dir__)
32
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
43
require 'grape-swagger-rails/version'
54

@@ -14,7 +13,7 @@ Gem::Specification.new do |spec|
1413
spec.license = 'MIT'
1514
spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
1615
spec.test_files = `git ls-files spec`.split($INPUT_RECORD_SEPARATOR)
17-
spec.require_paths = %w(lib)
16+
spec.require_paths = %w[lib]
1817

19-
spec.add_dependency 'railties', '>= 3.2.12'
18+
spec.add_dependency 'railties', '>= 6.0.6.1'
2019
end
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ActiveSupport::Inflector.inflections(:en) do |inflect|
2+
inflect.acronym 'API'
3+
end

0 commit comments

Comments
 (0)